Fixed the metadata alignment