fixed validation type
Merge branch 'bugfix/validation-types' into develop