Listener now actually works, fixed #17