* Fix onFailure of the listener
* Fix restart service function