--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java	Fri Mar 27 14:39:01 2015 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java	Fri Mar 27 16:54:56 2015 +0100
@@ -1078,7 +1078,7 @@
             }
         }
 
-        current.validate(this);
+        current.validate(this, context);
     }
 
 
@@ -1260,9 +1260,12 @@
         DefaultState cur = (DefaultState) getCurrentState(context);
 
         try {
-            if (cur.validate(this)) {
-                return getOutputForState(cur);
+            if (context instanceof CallContext) {
+                /* should be always true */
+                CallContext cc = (CallContext) context;
+                cur.validate(this, cc);
             }
+            return getOutputForState(cur);
         }
         catch (IllegalArgumentException iae) { }