When Muhammad was 35 years old, the argument over whether or not to fix the black stone after the reconstruction of the Ka'abah arose. There are many ways to fix the sentence so that it is grammatically correct, but this is how I would fix it (as a native English speaker). I think this way is one of the most natural ways to say it. :)