Fix bug 981584