Fix rpn