Add fix for systems with nested subdivisions.