Better consistency