6.5 fix