Waiting is not really necessary and it breaks tests. See #10