Bugfix for HB output & finished output