Fix Issue 10461

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