Fix modifying listener from inside a callback

Fix modifying listener from inside a callback #48