Fixing infinite loop on SingleSectionedDS