diff --git a/templates/SilverStripe/Forms/CompositeField.ss b/templates/SilverStripe/Forms/CompositeField.ss
index 41a3ea9b5..3a42cd042 100644
--- a/templates/SilverStripe/Forms/CompositeField.ss
+++ b/templates/SilverStripe/Forms/CompositeField.ss
@@ -1,6 +1,6 @@
 <% loop $FieldList %>
-	<% if $ColumnCount %>
-		<div class="column-{$ColumnCount} $FirstLast">
+	<% if $Up.ColumnCount %>
+		<div class="column-{$Up.ColumnCount} $FirstLast">
 			$FieldHolder
 		</div>
 	<% else %>
diff --git a/templates/SilverStripe/Forms/CompositeField_holder_small.ss b/templates/SilverStripe/Forms/CompositeField_holder_small.ss
index 081da5b4f..c7b433f13 100644
--- a/templates/SilverStripe/Forms/CompositeField_holder_small.ss
+++ b/templates/SilverStripe/Forms/CompositeField_holder_small.ss
@@ -4,8 +4,8 @@
 	<% end_if %>
 
 	<% loop $FieldList %>
-		<% if $ColumnCount %>
-			<div class="column-{$ColumnCount} $FirstLast">
+		<% if $Up.ColumnCount %>
+			<div class="column-{$Up.ColumnCount} $FirstLast">
 				$SmallFieldHolder
 			</div>
 		<% else %>