Fixing custom events

Second time's the charm. Making this able to merge. Follow up for #226