RI merge bug fix