Another 2.6 fix.