Fixing how metadata it's handled