Issue #216 Fixed validations