Fixes #190 "Can't access GenericEvent on scheduler"