Fixed a conformance issue