Fix parsing of BR & DMR