Fix for mass storage.