1986 Nissan Stanza engine wants to die when stopping

1986 Nissan Stanza, California version. The engine wants to die when stopping. I thought that the lock-up switch for the torque converter was not unlocking. I have installed a used valve body complete with lock-up solenoid and I still have the same problem. I have checked out the wiring going to the solenoid and it does make a circuit when the throttle is at idle. Note: the engine does not try to die in reverse, only in forward.