diff --git a/scripts/events.lua b/scripts/events.lua
index 78b8fe7d2..0a523bb45 100644
--- a/scripts/events.lua
+++ b/scripts/events.lua
@@ -109,3 +109,28 @@ do
   -- listener instead of doing nothing.
   expect_eq(2, i)
 end
+
+-- Accessing Sprite.events when closing the same sprite will call
+-- push_sprite_events() creating a new app::script::SpriteEvents
+-- instance again even when we've just destroyed the old one (because
+-- we're just closing the sprite).
+do
+  local s = Sprite(32, 32)
+  function onSpriteChange()
+    -- Do nothing
+  end
+  -- Here we access s.events for first time, creating the
+  -- app::script::SpriteEvents for this sprite.
+  s.events:on('change', onSpriteChange)
+  function onSiteChange()
+    -- Accessing s.events again on 'sitechange' when we're just
+    -- closing the sprite, re-generating its SpriteEvents instance.
+    -- We've to have special care of this case.
+    s.events:off(onSpriteChange)
+  end
+  app.events:on('sitechange', onSiteChange)
+  -- Closing the sprite will create a 'sitechange' event calling
+  -- onSiteChange() function.
+  s:close()
+  app.events:off(onSiteChange)
+end
diff --git a/scripts/save_file_command.lua b/scripts/save_file_command.lua
index dd800ec0d..b2963681c 100644
--- a/scripts/save_file_command.lua
+++ b/scripts/save_file_command.lua
@@ -6,8 +6,7 @@
 function fix_test_img(testImg, scale, fileExt, cm, c1)
   -- With file formats that don't support alpha channel, we
   -- compare totally transparent pixels (alpha=0) with black.
-  if fileExt == "bmp" or (fileExt == "tga" and
-			  cm == ColorMode.GRAYSCALE) then
+  if fileExt == "tga" and cm == ColorMode.GRAYSCALE then
     local pixel
     if cm == ColorMode.RGB then
       pixel = c1.rgbaPixel