Tax Calculations on 1.5.1.1

Greetings!
I'm using OC v1.5.1.1 on a client's live site.
In the U.S., tax is calculated on the product subtotal for the shipping address.
What I'm seeing is product subtotal + shipping rate * tax % which is incorrect.
Should be subtotal * tax%.

Shipping:
We're running live rates with UPS and USPS.
Geo Zones:
Apart from International and US, we have a third zone - US Shipping (TX).
Tax Class:
The Tax Class is configured for US Shipping (TX) at 8.25%.
All products are listed as taxable.

Questions: Have I overlooked something or is this the way OC v. 1.5.1.1 is configured? If this is the norm, where can I change the calculations and if someone would be so kind as to walk me through it, I would be elated.

Thanks in advance.
~Howard

..and Salutations!

I would imagine by now you have found either the solution or a fix for this problem.
The solution is built into opencart as it lets you configure shipping as taxable or non-taxable.
You would do this by first navigating through Admin > Extensions > Shipping > {your various enabled shipping methods} and then set each "Tax Class" = None

Good Luck!

Midgette

Actually...I completely overlooked the obvious! Chalking it up to the week I had!
Thanks so much, Midgette!