Fix for metadatas