Fixing hbx_id usage.