Quick fix on templates