Storage bug fixed2.