Possible fix for topevent links