Fix a constraint conflict