Fixed partitioning, again.