FIX: remove extra template substitution