diff --git a/src/attributes/AutosetAttribute.ts b/src/attributes/AutosetAttribute.ts
index 18ed073..03041a1 100644
--- a/src/attributes/AutosetAttribute.ts
+++ b/src/attributes/AutosetAttribute.ts
@@ -52,7 +52,8 @@ extends AttributeAbstract {
 
 	public static listeners: AttributeListeners[] = [
 		AttributeListeners.CHANGE,
-		AttributeListeners.FORM_FILL
+		AttributeListeners.FORM_FILL,
+		AttributeListeners.MODE_SWITCH
 	]
 
 	public static identity: AttributeIdentity = {
diff --git a/src/attributes/DefaultAttribute.ts b/src/attributes/DefaultAttribute.ts
index c3dc2aa..6e9598b 100644
--- a/src/attributes/DefaultAttribute.ts
+++ b/src/attributes/DefaultAttribute.ts
@@ -73,7 +73,8 @@ extends AttributeAbstract {
 
 	public static listeners: AttributeListeners[] = [
 		AttributeListeners.POST_CLEAR,
-		AttributeListeners.FORM_INIT
+		AttributeListeners.FORM_INIT,
+		AttributeListeners.FORM_FILL
 	]
 
 	public static identity: AttributeIdentity = {