Fix Handlebars helpers