Conformance fix