patch one fixes