Fix issue on service clean