Turn Signal not retracting Automatically

[crazy_camaro]

I have a 2004 X5 4.4I. The problem I'm having recently is that my left turn signal does not retract properly. If you guys notice there are 2 points that would cause your turn signal to retract. One is for short turn the other one is for long turn. If I do a short right turn it doesn’t retract. But it does retract on a long turn. I can hear the click on the short turn tryi9ng to retract it but it seems like it misses it. However for the left turn it works normally. Retract both on short and long turns.
Any ideas what this could be? Is it the turn signal module? Or is it the steering column assembly which holds the turn signal handle, the wiper, and the steering wheel adjustment? Please advice.
Also it would be great if someone could point out if there were any previous threads in regards to this issue.