Improved case where no template file is present