Another patch for an Issue #757