Resolved issue #7. Removed event listener