Fixed jinja handling