Fix: 0 value wrong interpretation