Fixing Event Listener Creation