Better handlebars check