Fix for brc rp mode