I think I see a bug happening here and we are not emitting the relevant things. A bit tired now for the night...