Fix cb linkage