diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
index 2c9ea55590..f2d4e00995 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
@@ -166,6 +166,10 @@ namespace System.Linq.Dynamic
                             {
                                 value = (firstFuncResult as Func<DynamicNode, object>)(node);
                             }
+                            if (firstFuncResult.GetType().IsValueType)
+                            {
+                                value = firstFuncResult;
+                            }
                             return value;
                         }).AsQueryable();
                     }
@@ -179,6 +183,10 @@ namespace System.Linq.Dynamic
                             {
                                 value = (firstFuncResult as Func<DynamicNode, object>)(node);
                             }
+                            if (firstFuncResult.GetType().IsValueType)
+                            {
+                                value = firstFuncResult;
+                            }
                             return value;
                         }).AsQueryable();
                     }
@@ -1101,8 +1109,8 @@ namespace System.Linq.Dynamic
                         var not = Expression.Not(Expression.TypeAs(invokedExpr, typeof(Nullable<bool>)));
                         expr = Expression.Lambda<Func<DynamicNode, bool>>(
                             Expression.Condition(
-                                 Expression.Property(not, "HasValue"), 
-                                 Expression.Property(not, "Value"), 
+                                 Expression.Property(not, "HasValue"),
+                                 Expression.Property(not, "Value"),
                                  Expression.Constant(false, typeof(bool))
                             ), parameters);
                     }