Fix for storage