Fixes skipped rows numbers and flow