Fix bug caused by string comparisons of int/float