[Bug fixed] Storage