diff --git a/grepolis.user.js b/grepolis.user.js
index 5bd2d07..f108d71 100644
--- a/grepolis.user.js
+++ b/grepolis.user.js
@@ -10,7 +10,7 @@
 //
 // @match			http://*.grepolis.com/game/*
 //
-// @version         1.1.58
+// @version         1.1.59
 // @updateURL		http://git.javil.eu/jan/userscripts/raw/master/grepolis.user.js
 // ==/UserScript==
 
@@ -113,19 +113,20 @@
 			function() {
 				console.log(xTownCount + ") get farms for town " + xTownId);
 				HelperTown.townSwitch(xTownId);
-				//HelperTown.handleInfoWindowJumpToTownClick();
 				var town = ITowns.getTown(xTownId);
-				WMap.mapJump({id:xTownId, ix:town.getIslandCoordinateX(), iy:town.getIslandCoordinateY()});
-				setTimeout(
+				HelperTown.handleInfoWindowJumpToTownClick(
+					{x:town.getIslandCoordinateX(), y:town.getIslandCoordinateY()}, id:xTownId},
+					null,
 					function() {
-				// 		console.log("getting farms for town " + xTownId);
-				// 		var farmtowns = $(".farmtown_owned_on_same_island");
-				// 		$.each(farmtowns, function(f, farmtown) { 
-				// 			var farmtownId = farmtown["id"].split("_")[2];
-				// 			console.log("got farm " + farmtownId + " for town " + xTownId);
-				// 			farm_ids[xTownId].push(+farmtownId);
-				// 		});
-				 	}, 2000);
+						WMap.mapTiles.focusTown(6417);
+						console.log("getting farms for town " + xTownId);
+						var farmtowns = $(".farmtown_owned_on_same_island");
+						$.each(farmtowns, function(f, farmtown) { 
+							var farmtownId = farmtown["id"].split("_")[2];
+							console.log("got farm " + farmtownId + " for town " + xTownId);
+							farm_ids[xTownId].push(+farmtownId);
+					});
+				});
 			}, xTownCount*5000);
 	}