Fixed unsubscribe issue