* fix conditions