Fix for storage

Fixes storage bug from last merge