Patch for XE 1.4.x