Fixing template again