Fixed templates again