handlebars fix??