Fix in conditional expressions