Added paranthesys around expressions multiplied by units so that the unit applies to a combined tag and not only to the last term
(cherry picked from commit 6478dd0c0f52e243b9774ce04e67c77b1c448f4f)