DL-60 Bug fixing when checking fields validity