Fix in logic assumptions