temporary fix for bug 893176