A tinsy bit closer to fixing bug 66622