Fix problem with zero being treated as number not string