rb patches fix