this is for bug 6104