fix ServiceHandler Bug