Updated to RP's API change.