rb bug fix