If you have a fork with the star nut system, upgrade to this Gusset Unilock Headset Headlock system. 'Headlock' type systems are great for replacing the Star System in threadless headsets. Gusset UK developed a simple solution to the headache of solving which length Headlock system to buy. They made a SET with 3 different length Cr-Mo bolts.
eBay