Marshall - can you review the fix that I made for this issue? It's still in Resolved state. I remember you saying something about wanting to do a "better" fix for this, so maybe you want to open a new issue to track that (for a future release), and close this one.
Thanks, -Adam
