Fix: wrong connections in hierarchical case