Bugfix handling double constraints