ticket: 4 Template output changed