Fix for metadata with spaces