BUG FIX: Declare the variable before using it.
Merge remote-tracking branch 'anshu/events'