ReAdded constraint that was lost in git merge...