Ignition key won't come out !

[Alycidon]

So getting to grips with my 2005 D5, got Vida from Cheshire D5 and sorted a lot out and changed various setting etc.

Now having an intermittent problem where by when switching off the key wont come back and out past position I. Looking in the handbook it says it has a keylock function that only allows the key to come out if the selector is in N or P. But I've always been able to remove the key with selector in any position. When it gets stuck I've tried moving the selector back and forth and pressing the trigger in and out, but the only way it comes out is with constant turning the key quite forcefully. Had the cover off around the ignition switch and along with what Id normally expect to see there is a black plastic housing with a green electrical plug that goes into the side of the ignition key Barrel with 86 21 509 DELPHI printed on it. Is this some sort of solenoid that is meant to control the keylock function ??

Paul.