Did not fix the bug but improved readability
Fixed bug introduced in previous commit

I may have fixed the bug but it's somewhat hard to say, the comportment is
strange...