Fix numeric data values not being correctly encoded