#5 fix service provider bug