update to latest JB, with a hack for the topics picked up