Fix #88 - Used wrapper function to remove listener.