Fixed: bad conditions