Storage provider fix