Patch for 1.6.4