--- a/entities/wfobjs.py	Tue Aug 25 12:36:23 2009 +0200
+++ b/entities/wfobjs.py	Tue Aug 25 12:38:37 2009 +0200
@@ -291,13 +291,18 @@
     __implements__ = (IWorkflowable,)
 
     @property
-    def current_workflow(self):
+    def main_workflow(self):
         """return current workflow applied to this entity"""
         if self.custom_workflow:
             return self.custom_workflow[0]
         return self.cwetype_workflow()
 
     @property
+    def current_workflow(self):
+        """return current workflow applied to this entity"""
+        return self.current_state.workflow
+
+    @property
     def current_state(self):
         """return current state entity"""
         return self.in_state and self.in_state[0] or None