the original behavior is restored.

Stefan, how would a fix look like that fits your intention?

TIA,

Michael.