Fixed issue where assigning to storage would result in undefined var