Patch for 1.4.1+