fixed constraints issues