- Completed merge

src/Repository/RelationBuilder.php

@@ -47,8 +47,13 @@ class RelationBuilder
 
             return $this->resolveRelation($name) ?: $this->resolveVirtual($name);
         }
-        elseif ( $relation = $this->resolver->searchFieldAnnotation($name, new Relation() ) ) {
-            return $this->instanciateEmptyObject($name, $relation);
+        else {
+            if ( $relation = $this->resolver->searchFieldAnnotation($name, new Relation() ) ) {
+                return $this->instanciateEmptyObject($name, $relation);
+            }
+            elseif ($virtual = $this->resolveVirtual($name)) {
+                return $virtual;
+            }
         }
 
         return false;