ENH: the more generalized constraint now seems to work, and it passes tests