RB bug fix