added fix for rb node