diff --git a/data/lua/wml-tags.lua b/data/lua/wml-tags.lua
index 51c30b6adf74..a87eed89d832 100644
--- a/data/lua/wml-tags.lua
+++ b/data/lua/wml-tags.lua
@@ -839,7 +839,7 @@ wml_actions.unstore_unit = function(cfg)
 	local x = cfg.x or unit.x or -1
 	local y = cfg.y or unit.y or -1
 	if cfg.location_id then
-		x, y = wesnoth.special_locations[cfg.location_id]
+		x,y = table.unpack(wesnoth.special_locations[cfg.location_id])
 	end
 	wesnoth.add_known_unit(unit.type)
 	if on_board(x, y) then
@@ -877,10 +877,10 @@ wml_actions.teleport = function(cfg)
 		return
 	end
 	local x,y = cfg.x, cfg.y
-	if not x or not y then
-		x,y = wesnoth.special_locations[cfg.location_id]
+	if cfg.location_id then
+		x,y = table.unpack(wesnoth.special_locations[cfg.location_id])
 	end
-	wesnoth.teleport(unit, cfg.x, cfg.y, cfg.check_passability == false, cfg.clear_shroud ~= false, cfg.animate)
+	wesnoth.teleport(unit, x, y, cfg.check_passability == false, cfg.clear_shroud ~= false, cfg.animate)
 end
 
 function wml_actions.remove_sound_source(cfg)