Constraint fix