make sure we end at the right stop gadget