Save Metadata Fixed