service stubs fix