Fixes #2611

Let me know what you think of the fix. Like I said, the perf implications could be sucky, so if there is a better way (and I'm sure there is) I'd be happy to implement it differently. I could always just cache those `offsetWidth`s for the length of the operation too if that sounds like a good idea to you (but I don't know if that will cause other problems).  Guidance needed. :)