diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index 46fc70ba..8efdb4eb 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -41,8 +41,9 @@ public class FlagStorage {
 		return flags.put(flagType, value) != value;
 	}
 
-	public Flag.Value<?> get(final Flag flagType) {
-		return flags.get(flagType);
+	@SuppressWarnings("unchecked")
+	public <T extends Enum<T> & Flag.Value<T>> Flag.Value<T> get(final Flag flagType) {
+		return (Flag.Value<T>) flags.get(flagType);
 	}
 
 	private void readKeys() {