MassStorage fix 1