diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 4f40eb7b4..6ac94f83a 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -14,6 +14,7 @@
  - fix [ 1167917 ] Link to Page Tree and No-Cache Imcompatible
  - fix [ 1168084 ] file uploads don't work.
  - fix [ 1167720 ] Folder::view() subfolder_loop - missing.. [mwilson]
+ - fix [ 1169379 ] eventscalendar wobjects have wrong scope after upgrade
 
 
 6.5.3
diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
index 369a5fe56..24f58ac74 100644
--- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
@@ -111,8 +111,8 @@ sub getEditForm {
 			-value=>[$self->getValue("scope")],
 			-options=>{
 				0=>WebGUI::International::get(508,"EventsCalendar"),
-				1=>WebGUI::International::get(509,"EventsCalendar"),
-				2=>WebGUI::International::get(510,"EventsCalendar"),
+				1=>WebGUI::International::get(510,"EventsCalendar"),
+				2=>WebGUI::International::get(509,"EventsCalendar"),
 			}
 		);
    	$tabform->getTab("display")->template(
@@ -239,10 +239,10 @@ sub view {
 	if ($scope == 0) { #calendar's scope is regular (immediate descendants)
 		$children = $self->getLineage(["children"],{returnObjects=>1,
 			includeOnlyClasses=>["WebGUI::Asset::Event","WebGUI::Asset::Relation"]});
-	} elsif ($scope == 1) { #calendar is master
+	} elsif ($scope == 2) { #calendar is master
 		$children = $self->getLineage(["descendants"],{returnObjects=>1,
 			includeOnlyClasses=>["WebGUI::Asset::Event","WebGUI::Asset::Relation"]});
-	} elsif ($scope == 2) { #calendar is global
+	} elsif ($scope == 1) { #calendar is global
 		$children = WebGUI::Asset::getRoot()->getLineage(["descendants"],{returnObjects=>1,
 			includeOnlyClasses=>["WebGUI::Asset::Event","WebGUI::Asset::Relation"]}); 
 	}