diff --git a/grepolis.user.js b/grepolis.user.js
index e6ae7f1..be45fe4 100644
--- a/grepolis.user.js
+++ b/grepolis.user.js
@@ -10,7 +10,7 @@
 //
 // @match			http://*.grepolis.com/game/*
 //
-// @version         1.0.82
+// @version         1.0.83
 // @updateURL		http://git.javil.eu/jan/userscripts/raw/master/grepolis.user.js
 // ==/UserScript==
 
@@ -153,7 +153,7 @@
 					return;
 				}
 
-				getWaresFromFarm(wnd, mood, xFarmId);
+				timeout = getWaresFromFarm(wnd, mood, xFarmId) * 1000 + rand(5);
 			} finally {
 				durations["farm-" + xFarmId] = timeout / 1000;
 				setTimeout(getWaresTick(xFarmId), timeout);
@@ -165,9 +165,11 @@
 		if(xMood - 6 > 80) {
 			log("Plündere " + xFarmId + " @ Mood: " + xMood);
 			xWindow.call('claimLoad', xFarmId.toString(), 'double', 300);
+			return 300;
 		} else {			
 			log("Fordere " + xFarmId + " @ Mood: " + xMood);
 			xWindow.call('claimLoad', xFarmId.toString(), 'normal', farmDuration);
+			return farmDuration;
 		}
 	}