Fix conformance to the right entity....