Fixes issue with Event hierarchy