Fixing e event propagating bug