A try to fix Issue 9606

Issue URL: http://d.puremagic.com/issues/show_bug.cgi?id=9606