Duplicate event listener. Fix #158 and Fix #144

Duplicate event listener. Fix #158 and Fix #144