Generic fix for validation events support