diff --git a/templates/forms/CompositeField_holder.ss b/templates/forms/CompositeField_holder.ss
index d4364c4ee..24f53616c 100644
--- a/templates/forms/CompositeField_holder.ss
+++ b/templates/forms/CompositeField_holder.ss
@@ -4,8 +4,8 @@
 	<% end_if %>
 
 	<% loop $FieldList %>
-		<% if $ColumnCount %>
-			<div class="column-{$ColumnCount} $FirstLast">
+		<% if $Top.ColumnCount %>
+			<div class="column-{$Top.ColumnCount} $FirstLast">
 				$FieldHolder
 			</div>
 		<% else %>