6.8 fix