Properly convert rP