hotfix: check validation