Possibly fixed by checked-in [3303a4f55b].  I still need to come up with a test case for this.  Meanwhile, would you please test this fix in your environment and let me know if the issue is still present?