diff --git a/src/openrct2/paint/map_element/fence.c b/src/openrct2/paint/map_element/fence.c
index 7f547c5e33..0c010b8216 100644
--- a/src/openrct2/paint/map_element/fence.c
+++ b/src/openrct2/paint/map_element/fence.c
@@ -130,9 +130,9 @@ static void fence_paint_wall(uint32 frameNum, const rct_scenery_entry * sceneryE
  * @param height (dx)
  * @param map_element (esi)
  */
-void fence_paint(uint8 direction, sint32 height, rct_map_element * map_element)
+void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element * map_element)
 {
-    gPaintSession.InteractionType = VIEWPORT_INTERACTION_ITEM_WALL;
+    session->InteractionType = VIEWPORT_INTERACTION_ITEM_WALL;
 
     rct_scenery_entry * sceneryEntry = get_wall_entry(map_element->properties.wall.type);
     if (sceneryEntry == NULL || sceneryEntry == (rct_scenery_entry *)-1) {
@@ -170,7 +170,7 @@ void fence_paint(uint8 direction, sint32 height, rct_map_element * map_element)
     }
 
     if (map_element->flags & MAP_ELEMENT_FLAG_GHOST) {
-        gPaintSession.InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
+        session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
         dword_141F710 = construction_markers[gConfigGeneral.construction_marker_colour];
     }
 
diff --git a/src/openrct2/paint/map_element/map_element.c b/src/openrct2/paint/map_element/map_element.c
index e99397e39f..5fc1ed421d 100644
--- a/src/openrct2/paint/map_element/map_element.c
+++ b/src/openrct2/paint/map_element/map_element.c
@@ -262,7 +262,7 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y)
             entrance_paint(direction, height, map_element);
             break;
         case MAP_ELEMENT_TYPE_WALL:
-            fence_paint(direction, height, map_element);
+            fence_paint(session, direction, height, map_element);
             break;
         case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE:
             scenery_multiple_paint(session, direction, height, map_element);
diff --git a/src/openrct2/paint/map_element/map_element.h b/src/openrct2/paint/map_element/map_element.h
index b2244e88fe..6bda2123a8 100644
--- a/src/openrct2/paint/map_element/map_element.h
+++ b/src/openrct2/paint/map_element/map_element.h
@@ -101,7 +101,7 @@ void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_m
 void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement);
 void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement);
 void scenery_paint(uint8 direction, sint32 height, rct_map_element* mapElement);
-void fence_paint(uint8 direction, sint32 height, rct_map_element* mapElement);
+void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* mapElement);
 void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement);
 void track_paint(uint8 direction, sint32 height, rct_map_element *mapElement);
 
diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c
index 0a7308301b..1ecc5c70fe 100644
--- a/test/testpaint/compat.c
+++ b/test/testpaint/compat.c
@@ -85,7 +85,7 @@ void banner_paint(paint_session * session, uint8 direction, int height, rct_map_
 void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { }
 void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { }
 void scenery_paint(uint8 direction, int height, rct_map_element *mapElement) { }
-void fence_paint(uint8 direction, int height, rct_map_element *mapElement) { }
+void fence_paint(paint_session * session, uint8 direction, int height, rct_map_element *mapElement) { }
 void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { }
 
 rct_ride *get_ride(int index) {