Fix single-number data field issue