Minor patch for an Issue #800