Fix in logic