Fix weird OR vs IF bug