Fix Storage attempt part 2