Fixed Bugs with Storage