patched 1.6.9 version