diff --git a/lib/CrEOF/Spatial/ORM/Query/GeometryWalker.php b/lib/CrEOF/Spatial/ORM/Query/GeometryWalker.php
index 8109cd7f2c2a21df63f090f3ec92fc64247e7471..98fa618f5f4d47bd2d30e1cb42c0995f45b31f40 100644
--- a/lib/CrEOF/Spatial/ORM/Query/GeometryWalker.php
+++ b/lib/CrEOF/Spatial/ORM/Query/GeometryWalker.php
@@ -67,11 +67,8 @@ class GeometryWalker extends SqlWalker
         $sql  = parent::walkSelectExpression($selectExpression);
 
         if (($expr instanceof ReturnsWKBInterface || $expr instanceof ReturnsWKTInterface) && !$selectExpression->hiddenAliasResultVariable) {
-            $pattern = '/.+AS ((\w+)(\d+))$/';
-
-            preg_match($pattern, $sql, $match);
-
-            $this->rsm->typeMappings[$match[1]] = 'geometry';
+            $alias = trim(strrchr($sql, ' '));
+            $this->rsm->typeMappings[$alias] = 'geometry';
         }
 
         return $sql;