correct vars in Service Provider implementation