Fix cases of single partition