Fix issue with simple and no connectivity cases.