v1.89 fix6