rb patch bug fix