Quick fix to properly handle option value with leading zero