Bug fix in StorageManager.