Hotfix Validation calls