rr bug fix & bundle update