Added minor optimisation