Issue #128 - fix validations