fix return walker