fixed handlebars
merged