#224 Implement wrapping in listeners