diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java b/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
index e9b00e53e..f8b9956d6 100644
--- a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
+++ b/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
@@ -414,7 +414,7 @@ public abstract class AbstractTransaction implements StrolchTransaction {
 			Parameter<?> parameter = bag.getParameter(parameterId);
 			return (T) parameter;
 
-		} else if (stateOrBagOrActivity.equals(Tags.STATE)) {
+		} else if (stateOrBagOrActivity.equals(Tags.TIMED_STATE)) {
 
 			if (elements.size() != 5) {
 				String msg = "Missing state Id on locator {0}"; //$NON-NLS-1$
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java b/li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java
index 4d07cd98d..87514cfd4 100644
--- a/li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java
+++ b/li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java
@@ -79,7 +79,7 @@ public class FindByLocatorTest {
 						resStringParam);
 
 				// TimedState on Resource
-				Locator locResIntegerState = Locator.valueOf("Resource/TestType/MyTestResource/State/@integerState");
+				Locator locResIntegerState = Locator.valueOf("Resource/TestType/MyTestResource/TimedState/@integerState");
 				IntegerTimedState integerS = tx.findElement(locResIntegerState);
 				assertNotNull("Should have found a IntegerTimedState with the locator " + locResIntegerState, integerS);