Fixed a core part of the diagram navigator