diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
index 921256c32..798c28a5e 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
@@ -1041,7 +1041,7 @@ public class AlfrescoSolrDataModel implements QueryConstants
 
     }
 
-    public String getDateDerivedFIeld(QName propertyQName)
+    public String getDateDerivedField(QName propertyQName)
     {
         PropertyDefinition propertyDefinition = getPropertyDefinition(propertyQName);
         return "part@sd@" + propertyDefinition.getName().toString();
@@ -1652,10 +1652,10 @@ public class AlfrescoSolrDataModel implements QueryConstants
         }
 
         if ((propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME)
-                || propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE) &&
-                !isDerivedDateField(fieldNameAndEnding.getSecond())))
+                || propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE)) &&
+                isDerivedDateField(fieldNameAndEnding.getSecond()))
         {
-            return getDateDerivedFIeld(propertyDef.getName()) + fieldNameAndEnding.getSecond();
+            return getDateDerivedField(propertyDef.getName()) + fieldNameAndEnding.getSecond();
         }
         else if (propertyDef.getDataType().getName().equals(DataTypeDefinition.TEXT))
         {
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
index a08266d50..f89fd7a2b 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
@@ -4232,7 +4232,7 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants
             {
                 return subQueryBuilder.getQuery(
                         AlfrescoSolrDataModel.getInstance()
-                                .getDateDerivedFIeld(propertyQName) + fieldNameAndEnding.getSecond(),
+                                .getDateDerivedField(propertyQName) + fieldNameAndEnding.getSecond(),
                         queryText, analysisMode, luceneFunction);
             }
         }