added the 2nd patch for 4.1.2