Fix custom metadata
Fix #96