Has anyone had an issue with their headlamp surround on a Plus Six? Mine don’t fit well and appear to have a random M5 nut used as a spacer on the retaining screw, between the surround and the plastic mounting.