Fix non-standard template