NOJIRA:  Fix validation issue