diff --git a/godot/local_map/grid/GameBoard.gd b/godot/local_map/grid/GameBoard.gd
index d06a26f3c578dcfbb89a0eb81b95a2044c7adfdb..f72062204d3d8d62e9a2f3b04b6aed7315da2c68 100644
--- a/godot/local_map/grid/GameBoard.gd
+++ b/godot/local_map/grid/GameBoard.gd
@@ -12,8 +12,6 @@ var pathfinder : Pathfinder = preload("res://local_map/grid/Pathfinder.gd").new(
 onready var pawns : YSort = $Pawns
 onready var spawning_point = $SpawningPoint
 
-export var map_size : = Vector2(16, 16)
-
 func _ready():
 	for pawn in pawns.get_children():
 		pawn.position = request_move(pawn, Vector2(0, 0))
diff --git a/godot/local_map/grid/Pathfinder.gd b/godot/local_map/grid/Pathfinder.gd
index 16fe6ede0b17179a9607d1ee6aa6177b1a513703..0b56bed5c2d65a3b2340a069305c01fce4617a9c 100644
--- a/godot/local_map/grid/Pathfinder.gd
+++ b/godot/local_map/grid/Pathfinder.gd
@@ -14,7 +14,7 @@ func initialize(grid : TileMap, obstacle_tile_ids : Array) -> void:
 	and connects all walkable paths
 	"""
 	# Initialize map size and obstacles array
-	_map_size = grid.map_size
+	_map_size = grid.get_used_rect().size
 	for id in obstacle_tile_ids:
 		var occupied_cells = (grid as TileMap).get_used_cells_by_id(id)
 		for cell in occupied_cells: