Fixed bug with new storage methods