Issue #57 fix validation fields