change to make constraints possible in all case