trans stalling car

2006 325i 3.0 stalls when coming to a stop unless i put the car in neutral i suspect toque converter or solenoid and i know there is probably a thread already but in a crunch only vehicle we got. thanks for any help in advance