Patch for 1.6.x

It must work!