Fix: service disabling timing