Fixed UOM not being calculated