fixed  in templates