FreeOrder constraint now fixed