Patched 1.6 with previous