Fixing bad service call