Fixed correct key for handler in whenFired