Contraints fixes. - 942v