Fix double listeners issue #39