Add second world check for optimisation