Fixing #32 by changing the event listened for