Fix partitioning