FIX #372: On upgrade service is stopped twice