Billable weight calculation issue fix