Fixed contraints for hopefully the last time