Hotfix for completed event support for validation