Fixed bug that caused leak in event listening
v 0.0.7