I have searched on many forums and this was the best solution for me and perhaps looks very expensive to do the fix with the stem but it was cheap & fast. There were one guy who had modify his XT660Z with YZ forks. He is a member here on XT660.com so search after YZ forks and you will found it.