Fix bug caused by comparing String with Number