MassStorage fix 2