Fix parsing error with numerical values, add test