(Added template change missing from previous commit)