Fix number, string handling bug