fixing from makelog-2