[FIX] correct use of templates