fix for target-less events