Update for an Issue #207 (and a potential patch for regression tests)