v1.9 fix6