Handlebars fix