diff --git a/src/templates/datagrid.latte b/src/templates/datagrid.latte
index 4b57c09e..aa72ce4a 100644
--- a/src/templates/datagrid.latte
+++ b/src/templates/datagrid.latte
@@ -248,7 +248,7 @@
 
 							{if !isset($toggle_detail)}
 								{if $inlineEdit && $inlineEdit->getItemId() == $row->getId()}
-									{php $inlineEdit->onSetDefaults($filter['inline_edit'], $item) }
+									{do $inlineEdit->onSetDefaults($filter['inline_edit'], $item) }
 
 									<tr data-id="{$row->getId()}" n:snippet="item-{$row->getId()}" n:attr="$row->getControl()->attrs">
 										<td n:if="$hasGroupActions" class="col-checkbox"></td>
@@ -288,7 +288,7 @@
 											{/if}
 										</td>
 										{foreach $columns as $key => $column}
-											{php $column = $row->applyColumnCallback($key, clone $column)}
+											{do $column = $row->applyColumnCallback($key, clone $column)}
 
 											{var $td = $column->getElementForRender('td', $key, $row)}
 											{$td->startTag()|noescape}
@@ -329,7 +329,7 @@
 
 										{if isset($filter['items_detail_form'])}
 											{var $item_detail_params['items_detail_form'] = $filter['items_detail_form']}
-											{php $filter['items_detail_form']->setItem($item)}
+											{do $filter['items_detail_form']->setItem($item)}
 										{/if}
 
 										{ifset #detail}
@@ -420,7 +420,7 @@
 
 {define inlineAddRow}
 	{if $inlineAdd->shouldBeRendered()}
-		{php $inlineAdd->onSetDefaults($filter['inline_add']) }
+		{do $inlineAdd->onSetDefaults($filter['inline_add']) }
 
 		<tr class="datagrid-row-inline-add datagrid-row-inline-add-hidden">
 			<td n:if="$hasGroupActions" class="col-checkbox"></td>
diff --git a/src/templates/datagrid_tree.latte b/src/templates/datagrid_tree.latte
index 5b9a1070..5f81f911 100644
--- a/src/templates/datagrid_tree.latte
+++ b/src/templates/datagrid_tree.latte
@@ -72,7 +72,7 @@
 						</a>
 						{foreach $columns as $key => $column}
 							{var $col = 'col-' . $key}
-							{php $column = $row->applyColumnCallback($key, clone $column)}
+							{do $column = $row->applyColumnCallback($key, clone $column)}
 
 							{if $column->hasTemplate()}
 								{include $column->getTemplate(), item => $item, (expand) $column->getTemplateVariables()}
@@ -98,7 +98,7 @@
 
 								<div class="datagrid-tree-item-right-columns-column text-{$column->hasAlign() ? $column->getAlign() : 'start'}">
 									{var $col = 'col-' . $key}
-									{php $column = $row->applyColumnCallback($key, clone $column)}
+									{do $column = $row->applyColumnCallback($key, clone $column)}
 
 									{if $column->hasTemplate()}
 										{include $column->getTemplate(), row => $row, item => $item, (expand) $column->getTemplateVariables()}