num validation
Hotfix to fix last merge
hot fixes for merge