sideport of fix for validation dialog from issue-207