Fixed bug when data value is not a string