RP support. bugfix.