Patch from Gert-Jan Vons: create an event handle to go in the