Fixed nasty bug with remove_listener hooks