Quick fix. Necessary for Bug 800402