Bug 852623: adding a work around for bug 660107