fix issue caused by hanging eventHandlers
0.6.1