MassStorage fix 6