Try to fix handlebars stuff