Applied workaround for bug 969860