diff --git a/src/ifcgeom/mapping/IfcGradientCurve.cpp b/src/ifcgeom/mapping/IfcGradientCurve.cpp
index 67596b291c..969d07eee0 100644
--- a/src/ifcgeom/mapping/IfcGradientCurve.cpp
+++ b/src/ifcgeom/mapping/IfcGradientCurve.cpp
@@ -51,7 +51,7 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcGradientCurve* inst) {
 		auto xy = horizontal->evaluate(u);
 		auto z = vertical->evaluate(u);
 		Eigen::VectorXd vec(3);
-		vec << xy(0), xy(1), z(2);
+		vec << xy(0), xy(1), z(1);
 		return vec;
 	};
 
diff --git a/src/ifcgeom/mapping/mapping.i b/src/ifcgeom/mapping/mapping.i
index 5a1dc62572..57de49a16d 100644
--- a/src/ifcgeom/mapping/mapping.i
+++ b/src/ifcgeom/mapping/mapping.i
@@ -113,10 +113,10 @@ BIND(IfcEdge);
 BIND(IfcEdgeLoop);
 BIND(IfcPolyline);
 BIND(IfcPolyLoop);
-BIND(IfcCompositeCurve);
 #ifdef SCHEMA_HAS_IfcGradientCurve
 BIND(IfcGradientCurve);
 #endif
+BIND(IfcCompositeCurve);
 BIND(IfcTrimmedCurve);
 BIND(IfcArbitraryOpenProfileDef);
 #ifdef SCHEMA_HAS_IfcIndexedPolyCurve