fixes in segmented scan