Fix jump-stacking