This also fixes [Bugzilla 9747](http://d.puremagic.com/issues/show_bug.cgi?id=9747).