Fix a bug where the return value from calling events were not correct.