diff --git a/li.strolch.model/src/main/java/li/strolch/model/Resource.java b/li.strolch.model/src/main/java/li/strolch/model/Resource.java
index 0e7314337..356c93543 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/Resource.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/Resource.java
@@ -69,8 +69,8 @@ public class Resource extends GroupedParameterizedElement
 		strolchTimedState.setParent(this);
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public <T extends StrolchTimedState> T getTimedState(String id) {
+	@SuppressWarnings({ "unchecked" })
+	public <T extends StrolchTimedState<?>> T getTimedState(String id) {
 		if (this.timedStateMap == null) {
 			return null;
 		}