[IMP] Consistently calculate with units on BoM