Issue #238 Fixed event listener subscription