fix #227
fix #228
Use disabled fields in validation process