Fix handling of subpartitions