Fixed metadata reseting!!!!