diff --git a/tpl/macros_struct.twig b/tpl/macros_struct.twig
index 37385e7..4cf61d0 100644
--- a/tpl/macros_struct.twig
+++ b/tpl/macros_struct.twig
@@ -37,12 +37,10 @@ type {{ s.name }} struct {
 {{ _self.table_methods(s) }}
 {% endif %}
 
-{% if has_token(s, 'data_root') %}
-{{ _self.data_root_methods(s) }}
-{% endif %}
-
 {% if has_token(s, 'diff_removed') %}
 {{ _self.diff_removed_methods(s) }}
+{% elseif has_token(s, 'data_root') %}
+{{ _self.data_root_methods(s) }}
 {% endif %}
 
 {% if json_fields|length > 0 %}