diff --git a/.squot b/.squot
index 5d07dee..3139a59 100644
--- a/.squot
+++ b/.squot
@@ -1,6 +1,6 @@
 OrderedDictionary {
-	'src\/ContextS2-Core.package' : #SquotCypressCodeSerializer,
-	'src\/ContextS2-Tests.package' : #SquotCypressCodeSerializer,
-	'src\/BoBreakout.package' : #SquotCypressCodeSerializer,
-	'src\/BaselineOfContextS.package' : #SquotCypressCodeSerializer
+	'src/ContextS2-Core.package' : #SquotCypressCodeSerializer,
+	'src/ContextS2-Tests.package' : #SquotCypressCodeSerializer,
+	'src/BoBreakout.package' : #SquotCypressCodeSerializer,
+	'src/BaselineOfContextS.package' : #SquotCypressCodeSerializer
 }
\ No newline at end of file
diff --git a/src/ContextS2-Core.package/PseudoClass.extension/instance/addMethodChange..st b/src/ContextS2-Core.package/PseudoClass.extension/instance/addMethodChange..st
index 3bbc395..b19fba8 100644
--- a/src/ContextS2-Core.package/PseudoClass.extension/instance/addMethodChange..st
+++ b/src/ContextS2-Core.package/PseudoClass.extension/instance/addMethodChange..st
@@ -1,10 +1,11 @@
 *contexts2-core-methods-override
 addMethodChange: aChangeRecord
+	 
 	"override this to re-add the layers to the selector, so we can load multiple partial methods"
 	| selector |
 	selector := self newParser parseSelector: aChangeRecord string.
 	"--- BEGIN CONTEXTS OVERRIDE ---"
-	((((self newParser parse: aChangeRecord string class: UndefinedObject)
+	((((self newParser parse: aChangeRecord string class: (aChangeRecord methodClass ifNil: [Object]))
 		properties pragmas
 		select: [:p | p keyword = #layer:])
 		gather: [:p | p arguments]) collect: [:a | a asString])
diff --git a/src/ContextS2-Core.package/PseudoClass.extension/methodProperties.json b/src/ContextS2-Core.package/PseudoClass.extension/methodProperties.json
index 1c63e84..64b0b4a 100644
--- a/src/ContextS2-Core.package/PseudoClass.extension/methodProperties.json
+++ b/src/ContextS2-Core.package/PseudoClass.extension/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"addMethodChange:" : "pre 10/30/2019 16:18" } }
+		"addMethodChange:" : "ct 9/4/2021 01:10" } }