Ok then, lets leave it like that

We also need unit tests for both cases though. But as soon as the init part is fixed, ready to merge.