Fix issue with close
event always being emitted
#408
+3
−1
Merged