I didn't wanted to commit this. I wasn't sure it the wait was done, so I wanted to check this before commit.

I'll remote this in a new commit.