Fixed reset on non-exit shutdown