Partitions fix