Workaround (fix) for bug 1020350