Fixed metadata not working properly