Fixed constraints issue