Fixed storageutils