hbn bug workaround