ticket: 6 Templates fixed