[673] optimisation. stop earier