Yep it is the inner cable that is stuck in there, Make sure you pull from as close to the clocks as poss. I have also found it easier to put the inner cable back in again first then push the outer up and clip into place. Also it is a tad easier if you take off the steering wheel, Can be done with it on but it is a bit of a squeeze to get it past the hazard light switch and then slide it past the wheel, Good chance you could mark the dash.
Have Fun
Mike