try to fix validation bug
merge