Hot fix to field value problem.