1 files changed, 7 insertions, 2 deletions
diff --git a/include/mbgl/style/conversion/property_value.hpp b/include/mbgl/style/conversion/property_value.hpp
index 97117de2ec..3130661f61 100644
--- a/include/mbgl/style/conversion/property_value.hpp
+++ b/include/mbgl/style/conversion/property_value.hpp
@@ -4,11 +4,11 @@
 #include <mbgl/style/conversion.hpp>
 #include <mbgl/style/conversion/constant.hpp>
 #include <mbgl/style/conversion/function.hpp>
-#include <mbgl/style/conversion/expression.hpp>
 #include <mbgl/style/expression/value.hpp>
 #include <mbgl/style/expression/is_constant.hpp>
 #include <mbgl/style/expression/is_expression.hpp>
 #include <mbgl/style/expression/find_zoom_curve.hpp>
+#include <mbgl/style/expression/parsing_context.hpp>
 
 namespace mbgl {
 namespace style {
@@ -17,13 +17,18 @@ namespace conversion {
 template <class T>
 struct Converter<PropertyValue<T>> {
     optional<PropertyValue<T>> operator()(const Convertible& value, Error& error) const {
+        using namespace mbgl::style::expression;
+
         if (isUndefined(value)) {
             return PropertyValue<T>();
         } else if (isExpression(value)) {
-            optional<std::unique_ptr<Expression>> expression = convert<std::unique_ptr<Expression>>(value, error, valueTypeToExpressionType<T>());
+            ParsingContext ctx(valueTypeToExpressionType<T>());
+            ParseResult expression = ctx.parseLayerPropertyExpression(value);
             if (!expression) {
+                error = { ctx.getCombinedErrors() };
                 return {};
             }
+
             if (isFeatureConstant(**expression)) {
                 return { CameraFunction<T>(std::move(*expression)) };
             } else {