Fix #523 enclose field value into quotes