Fixed bad HBS problems