Fixed templating issue causing the event bug
Fixed a typo