Update for Rainbow v45. Issue #1