Fix on shutdown unsubscribe issue