fix conditions and validators