Changed template behavoir