I had exactly the same problem and your suggestion worked like a charm! Thanks a lot for this fix! :-)
By the way, I just downloaded the TBB 4.0 Update 4 and the fix is not there yet. Do you plan to officially release it in one of the next releases?