diff --git a/templates/SilverStripe/Forms/CompositeField.ss b/templates/SilverStripe/Forms/CompositeField.ss
index 2fb53afa3..41a3ea9b5 100644
--- a/templates/SilverStripe/Forms/CompositeField.ss
+++ b/templates/SilverStripe/Forms/CompositeField.ss
@@ -1,9 +1,9 @@
 <% loop $FieldList %>
 	<% if $ColumnCount %>
 		<div class="column-{$ColumnCount} $FirstLast">
-			$Field
+			$FieldHolder
 		</div>
 	<% else %>
-		$Field
+		$FieldHolder
 	<% end_if %>
 <% end_loop %>