+ Correction and a minor optimisation