Added temporary fix for bug 698764