diff --git a/source/java/org/alfresco/repo/version/VersionableAspect.java b/source/java/org/alfresco/repo/version/VersionableAspect.java
index d64c169ff9..670ab40330 100644
--- a/source/java/org/alfresco/repo/version/VersionableAspect.java
+++ b/source/java/org/alfresco/repo/version/VersionableAspect.java
@@ -263,7 +263,8 @@ public class VersionableAspect
             Action action = this.actionService.createAction(CreateVersionActionExecuter.NAME);
             ActionCondition condition = this.actionService.createActionCondition(HasVersionHistoryEvaluator.NAME);
             condition.setInvertCondition(true);
-            action.addActionCondition(condition);
+            // conditions are only evaluated on the parent rule - not the contained actions
+            rule.addActionCondition(condition);
             this.rule.addAction(action);
         }
         
diff --git a/source/java/org/alfresco/util/SearchLanguageConversionTest.java b/source/java/org/alfresco/util/SearchLanguageConversionTest.java
index 47b1dcfa7d..35227ebb81 100644
--- a/source/java/org/alfresco/util/SearchLanguageConversionTest.java
+++ b/source/java/org/alfresco/util/SearchLanguageConversionTest.java
@@ -79,7 +79,7 @@ public class SearchLanguageConversionTest extends TestCase
     {
         String good = SearchLanguageConversion.convertXPathLikeToRegex(BAD_STRING);
         assertEquals("XPath like to regex failed",
-                "\\ \\| ! \" £ " +
+                "(?s)\\ \\| ! \" £ " +
                 "\\$ .* \\^ & \\* \\( " +
                 "\\) . \\{ \\} [ ] " +
                 "@ # ~ ' : ; " +