Switched to using proper templates.