Yes, the fix I have will do that (and it removes the hardcoded widths entirely).