fix improper mandatory constraints handling