Fix Storage bug