diff --git a/src/gfx/reverse.cpp b/src/gfx/reverse.cpp
index 85b2db53..496a6dab 100644
--- a/src/gfx/reverse.cpp
+++ b/src/gfx/reverse.cpp
@@ -552,7 +552,7 @@ void reverse() {
 			// Get the tile ID at this location
 			size_t tileOfs =
 			    tilemap ? static_cast<uint8_t>((*tilemap)[index] - options.baseTileIDs[bank])
-			                  + (bank ? nbTilesInBank[0] : 0)
+			                  + (bank ? options.maxNbTiles[0] : 0)
 			            : index;
 			// This should have been enforced by the earlier checking.
 			assume(tileOfs < nbTiles + options.trim);
diff --git a/test/gfx/reverse_input_tileset.2bpp b/test/gfx/reverse_input_tileset.2bpp
new file mode 100644
index 00000000..61e3d4ff
Binary files /dev/null and b/test/gfx/reverse_input_tileset.2bpp differ
diff --git a/test/gfx/reverse_input_tileset.attrmap b/test/gfx/reverse_input_tileset.attrmap
new file mode 100644
index 00000000..8c2a6c0e
Binary files /dev/null and b/test/gfx/reverse_input_tileset.attrmap differ
diff --git a/test/gfx/reverse_input_tileset.flags b/test/gfx/reverse_input_tileset.flags
new file mode 100644
index 00000000..5c2e3fb1
--- /dev/null
+++ b/test/gfx/reverse_input_tileset.flags
@@ -0,0 +1,5 @@
+-u
+-N 3,2
+-i reverse_input_tileset.in.2bpp
+-t reverse_input_tileset.tilemap
+-a reverse_input_tileset.attrmap
diff --git a/test/gfx/reverse_input_tileset.in.2bpp b/test/gfx/reverse_input_tileset.in.2bpp
new file mode 100644
index 00000000..875b69f9
Binary files /dev/null and b/test/gfx/reverse_input_tileset.in.2bpp differ
diff --git a/test/gfx/reverse_input_tileset.tilemap b/test/gfx/reverse_input_tileset.tilemap
new file mode 100644
index 00000000..693ddc9c
Binary files /dev/null and b/test/gfx/reverse_input_tileset.tilemap differ