fix validate fields