Fix previous optimisation