applied patch similiar proposed by dave tweed