move reorder to better place, really stop pipeline when intended