Storage bugfix