Fixing condition behavior