Fix RPN