[BUGFIX] Fix ordering in Templates