Somehow this smells like a bug (either now or fixed by this) -> also a different commit?