Better handling when string is just a number