Fix 'comparison of String with 0 failed'