Fixed bug in default Template rendering