Issue #157 fix validations