fix conditions