Updated for actual RPN
Further fixing for RPN.