fix conformance