Fix for metadata mix-and-match vulnerability.