Quick & dirty hack for template arguments in 2.063.2