diff --git a/src/common/gamecode/monster.c b/src/common/gamecode/monster.c
index 42f3bb0cd..5c4c41bc7 100644
--- a/src/common/gamecode/monster.c
+++ b/src/common/gamecode/monster.c
@@ -116,13 +116,14 @@ get_money_for_dragon(region * r, unit * u, int wanted)
   /* falls der drache launisch ist, oder das regionssilber knapp, greift er alle an */
 	n = 0;
   for (u2 = r->units; u2; u2 = u2->next) {
-    if (u2->faction != u->faction && get_money(u2)) {
-      if (getguard(u2) & GUARD_TAX) continue;
+    if (u2->faction != u->faction && cansee(u->faction, r, u2, 0)) {
+      int m = get_money(u2);
+      if (m==0 || (getguard(u2) & GUARD_TAX)) continue;
       else {
         order * ord = monster_attack(u, u2);
         if (ord) {
           addlist(&u->orders, ord);
-          n += get_money(u2);
+          n += m;
         }
       }
     }
@@ -139,19 +140,22 @@ get_money_for_dragon(region * r, unit * u, int wanted)
 }
 
 static int
-money(region * r)
+all_money(region * r, faction * f)
 {
 	unit *u;
 	int m;
 
 	m = rmoney(r);
-	for (u = r->units; u; u = u->next)
-		m += get_money(u);
+  for (u = r->units; u; u = u->next) {
+    if (f!=u->faction) {
+      m += get_money(u);
+    }
+	}
 	return m;
 }
 
 static direction_t
-richest_neighbour(region * r, int absolut)
+richest_neighbour(region * r, faction * f, int absolut)
 {
 
 	/* m - maximum an Geld, d - Richtung, i - index, t = Geld hier */
@@ -161,9 +165,9 @@ richest_neighbour(region * r, int absolut)
 	direction_t d = NODIRECTION, i;
 
 	if (absolut == 1 || rpeasants(r) == 0) {
-		m = (double) money(r);
+		m = (double) all_money(r, f);
 	} else {
-		m = (double) money(r) / (double) rpeasants(r);
+		m = (double) all_money(r, f) / (double) rpeasants(r);
 	}
 
 	/* finde die region mit dem meisten geld */
@@ -171,9 +175,9 @@ richest_neighbour(region * r, int absolut)
 	for (i = 0; i != MAXDIRECTIONS; i++)
 		if (rconnect(r, i) && rterrain(rconnect(r, i)) != T_OCEAN) {
 			if (absolut == 1 || rpeasants(r) == 0) {
-				t = (double) money(rconnect(r, i));
+				t = (double) all_money(rconnect(r, i), f);
 			} else {
-				t = (double) money(rconnect(r, i)) / (double) rpeasants(r);
+				t = (double) all_money(rconnect(r, i), f) / (double) rpeasants(r);
 			}
 
 			if (t > m) {
@@ -304,7 +308,7 @@ monster_move(region * r, unit * u)
     case RC_FIREDRAGON:
     case RC_DRAGON:
     case RC_WYRM:
-      d = richest_neighbour(r, 1);
+      d = richest_neighbour(r, u->faction, 1);
       break;
     case RC_TREEMAN:
       d = treeman_neighbour(r);
@@ -333,7 +337,7 @@ monster_move(region * r, unit * u)
 static int
 dragon_affinity_value(region *r, unit *u)
 {
-	int m = count_all_money(r);
+	int m = all_money(r, u->faction);
 
 	if(u->race == new_race[RC_FIREDRAGON]) {
 		return (int)(normalvariate(m,m/2));
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index d042b3e47..96bf83df1 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -552,18 +552,6 @@ resourcepath(void)
 	return strcat(strcpy(zText, basepath()), "/res");
 }
 
-int
-count_all_money(const region * r)
-{
-	const unit *u;
-	int m = rmoney(r);
-
-	for (u = r->units; u; u = u->next)
-		m += get_money(u);
-
-	return m;
-}
-
 int
 count_skill(faction * f, skill_t sk)
 {
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index 0d6e7ba4e..e3aaac3ac 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -907,7 +907,6 @@ extern int lighthouse_range(const struct building * b, const struct faction * f)
 /* skills */
 extern int max_skill(struct faction * f, skill_t sk);
 extern int count_skill(struct faction * f, skill_t sk);
-extern int count_all_money(const struct region * r);
 
 /* direction, geography */
 extern const char *directions[];
diff --git a/src/mapper/map_region.c b/src/mapper/map_region.c
index dd07ad159..e06d8e29d 100644
--- a/src/mapper/map_region.c
+++ b/src/mapper/map_region.c
@@ -171,6 +171,18 @@ SpecialFunction(region *r)
 	delwin(win);
 }
 
+static int
+count_all_money(const region * r)
+{
+  const unit *u;
+  int m = rmoney(r);
+
+  for (u = r->units; u; u = u->next)
+    m += get_money(u);
+
+  return m;
+}
+
 char Tchar[MAXRACES] = "ZEOGMTDIHK~uifdwtbrsz";
 
 void