Last minute template fix