RB id key patch - fix code