[PATCH] patch for 638995