Trying to fix hbs issue...