Fix jinja error and go back to original