Fix unsubscribe bug