Properly handle numbers in values