Fix support for custom handlebars instance