Fixed logic conditions