Fixed bug
Merge branch 'constraints-from-params' into constraints-paperclip-fix