bug 964: Be a bit more paranoid here ...