work around bug 1079796