Fix Storage attempt part 2

This might also be required after the first change