Changed constraint collection in accordance to the comment from @guwac on the last commit