Makes sense. I think this probably actually fixes other bugs, then. I wish I knew what they were, but I think this is almost definitely an improvement.