Fix bad conditions