adjust to latest JB changes