FIX: fixed template variables