Better handling of special case: zero