Fix the metadata interception