Fix on metadata