Small optimisation in final phase