Added workaround for bug 20607