patch for 1.9 should apply to 2.0 or later