Temporary Handlebars fix, resolves #14