While doing this, it was discovered that the problem also persists for EdgePairs and Texts. In order to provide a more generic solution, some refactoring was applied.
Matthias Koefferlein