Fix the metadata return value