Add Workaround to stopSelf services