Fix. Properly remove an event callback from another event callback

Thanks @wakamoleguy