@florian-burger: hmm, there is no way to avoid this doubling of code!?