Fixed handlebars

I copied the answer code into my project to fix the handlebar issue.