more fixing template