quick fix for bug 846055