diff --git a/game/scripts/characters/astoria/common.rpy b/game/scripts/characters/astoria/common.rpy
index 9a7e1c4f..17ba608d 100644
--- a/game/scripts/characters/astoria/common.rpy
+++ b/game/scripts/characters/astoria/common.rpy
@@ -40,8 +40,7 @@ init python:
         def show():
             astoria.show(force=True)
 
-            if not renpy.in_rollback():
-                renpy.with_statement(trans or d2)
+            renpy.with_statement({"dolls": trans or d2})
 
         face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
         temp_face = renpy.game.context().temporary_attributes
diff --git a/game/scripts/characters/cho/common.rpy b/game/scripts/characters/cho/common.rpy
index 818d907e..5087295a 100644
--- a/game/scripts/characters/cho/common.rpy
+++ b/game/scripts/characters/cho/common.rpy
@@ -38,8 +38,7 @@ init python in character:
         def show():
             renpy.store.cho.show(force=True)
 
-            if not renpy.in_rollback():
-                renpy.with_statement(trans or renpy.store.d2)
+            renpy.with_statement({"dolls": trans or d2})
 
         face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
         temp_face = renpy.game.context().temporary_attributes
diff --git a/game/scripts/characters/genie/common.rpy b/game/scripts/characters/genie/common.rpy
index 0f207dcf..29c1d4e3 100644
--- a/game/scripts/characters/genie/common.rpy
+++ b/game/scripts/characters/genie/common.rpy
@@ -36,6 +36,8 @@ init python:
             if renpy.showing("genie", layer=layer):
                 renpy.show(variant, layer=layer, tag="genie", at_list=at_list)
 
+            renpy.with_statement({"dolls": trans or d2})
+
         if flip is not None:
             states.gen.image.xzoom = -1 if flip else 1
 
diff --git a/game/scripts/characters/hermione/common.rpy b/game/scripts/characters/hermione/common.rpy
index 90d99606..70ffb61e 100644
--- a/game/scripts/characters/hermione/common.rpy
+++ b/game/scripts/characters/hermione/common.rpy
@@ -33,8 +33,7 @@ init python:
         def show():
             hermione.show(force=True)
 
-            if not renpy.in_rollback():
-                renpy.with_statement(trans or d2)
+            renpy.with_statement({"dolls": trans or d2})
 
         face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
         temp_face = renpy.game.context().temporary_attributes
diff --git a/game/scripts/characters/hooch/common.rpy b/game/scripts/characters/hooch/common.rpy
index 4deedae3..2f2266f5 100644
--- a/game/scripts/characters/hooch/common.rpy
+++ b/game/scripts/characters/hooch/common.rpy
@@ -24,8 +24,7 @@ init python:
         def show():
             hooch.show(force=True)
 
-            if not renpy.in_rollback():
-                renpy.with_statement(trans or d2)
+            renpy.with_statement({"dolls": trans or d2})
 
         face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
         temp_face = renpy.game.context().temporary_attributes
diff --git a/game/scripts/characters/luna/common.rpy b/game/scripts/characters/luna/common.rpy
index a87252e8..e4343ff4 100644
--- a/game/scripts/characters/luna/common.rpy
+++ b/game/scripts/characters/luna/common.rpy
@@ -36,8 +36,7 @@ init python:
         def show():
             luna.show(force=True)
 
-            if not renpy.in_rollback():
-                renpy.with_statement(trans or d2)
+            renpy.with_statement({"dolls": trans or d2})
 
         face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
         temp_face = renpy.game.context().temporary_attributes
diff --git a/game/scripts/characters/snape/common.rpy b/game/scripts/characters/snape/common.rpy
index 3e02971e..57a627c8 100644
--- a/game/scripts/characters/snape/common.rpy
+++ b/game/scripts/characters/snape/common.rpy
@@ -56,11 +56,7 @@ init python:
 
             renpy.show(name=tag, at_list=at_list, layer=layer, what=sprite, zorder=states.sna.image.zorder)
 
-            if not renpy.in_rollback():
-                if trans:
-                    renpy.with_statement(trans)
-                else:
-                    renpy.with_statement(d2)
+            renpy.with_statement({"dolls": trans or d2})
 
         if what:
             character.snape_say(what, **kwargs)
diff --git a/game/scripts/characters/susan/common.rpy b/game/scripts/characters/susan/common.rpy
index 5b24252d..c0d5eaa7 100644
--- a/game/scripts/characters/susan/common.rpy
+++ b/game/scripts/characters/susan/common.rpy
@@ -35,8 +35,7 @@ init python:
         def show():
             susan.show(force=True)
 
-            if not renpy.in_rollback():
-                renpy.with_statement(trans or d2)
+            renpy.with_statement({"dolls": trans or d2})
 
         face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
         temp_face = renpy.game.context().temporary_attributes
diff --git a/game/scripts/characters/tonks/common.rpy b/game/scripts/characters/tonks/common.rpy
index dbc2c74b..3d41aba8 100644
--- a/game/scripts/characters/tonks/common.rpy
+++ b/game/scripts/characters/tonks/common.rpy
@@ -46,8 +46,7 @@ init python:
         def show():
             tonks.show(force=True)
 
-            if not renpy.in_rollback():
-                renpy.with_statement(trans or d2)
+            renpy.with_statement({"dolls": trans or d2})
 
         face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
         temp_face = renpy.game.context().temporary_attributes