Fix encoding bug in CDBR and add it to disassembler