ModelServiceProvider minimal fix