and another minor fix in service stopping call