Fixed issue with Storage constructor.