Fix for invald storage schemas