X-Git-Url: http://nitlanguage.org

diff --git a/lib/gamnit/flat/flat_core.nit b/lib/gamnit/flat/flat_core.nit
index 932a584..dcb11f6 100644
--- a/lib/gamnit/flat/flat_core.nit
+++ b/lib/gamnit/flat/flat_core.nit
@@ -961,6 +961,10 @@ class SpriteSet
 	do
 		# Remap sprites that may need to change context
 		for sprite in sprites_to_remap do
+
+			# Skip if it was removed from this set after being modified
+			if sprite.context != self then continue
+
 			unmap_sprite sprite
 			map_sprite sprite
 		end