Fix for storage checking
Bugfixes