Second attempt at fixing HB parse error