hotfix for validation