fixup for handlebars amd