BUG-FIX Template should be instance property here