Should fix #272, by rejiggering the partitions.