Fixed an issue in output template, again