Fixed bug with template display on first run