Minor patch for an Issue #575