Minor patch for Issue #585