diff --git a/castor/plugin.jelly b/castor/plugin.jelly
index 6648e526..1503c89f 100644
--- a/castor/plugin.jelly
+++ b/castor/plugin.jelly
@@ -26,18 +26,18 @@
       <j:set var="fileVar" value="${schema}.filename"/>
       <j:set var="uptodateVar" value="${schema}.uptodate"/>
       <ant:basename property="${fileVar}" file="${schema}"/>
-      <j:set var="filename" value="${pom.getContext().getVariable(fileVar)}"/>
-      <j:set var="context" 
-             value="${pom.getPluginContext('maven-castor-plugin')}"/>
-      <j:set var="log" value="${context.getVariable('maven.castor.tstamp')}"/>
-      <j:set var="gen" value="${context.getVariable('maven.castor.dest')}"/>
+      <!-- wtf? shouldn't this be plugin.context? -->
+      <j:set var="filename" value="${pom.context.getVariable(fileVar)}"/>
+      <j:set var="log" value="${maven.castor.tstamp}"/>
+      <j:set var="gen" value="${maven.castor.dest}"/>
 
       <ant:uptodate property="${uptodateVar}" targetfile="${log}/${filename}">
         <ant:srcfiles dir="${basedir}" includes="${schema}"/>
       </ant:uptodate>
 
+      <!-- wtf? shouldn't this be plugin.context? -->
       <j:set var="uptodate" 
-             value="${pom.getContext().getVariable(uptodateVar)}"/>
+             value="${pom.context.getVariable(uptodateVar)}"/>
 
       <j:if test="${uptodate == null}">
         <ant:echo message="Generating sources for ${schema}"/>