final 2.6 fix hopefully