diff --git a/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java b/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java
index 852cdd6fd8..e89ab2c10a 100644
--- a/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java
+++ b/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java
@@ -57,10 +57,21 @@ public class CurrentVersionEvaluator extends AbstractActionEvaluator
 
     public boolean isAllowed(CMISNodeInfo nodeInfo)
     {
-        if (!nodeInfo.isCurrentVersion())
+        if(nodeInfo.hasPWC())
         {
-            return nonCurrentVersionValue;
+            if(!nodeInfo.isPWC())
+            {
+                return nonCurrentVersionValue;
+            }
         }
+        else
+        {
+            if (!nodeInfo.isCurrentVersion())
+            {
+                return nonCurrentVersionValue;
+            }
+        }
+        
 
         return currentVersionEvaluator == null ? currentVersionValue : currentVersionEvaluator.isAllowed(nodeInfo);
     }