Don't wait, and forgot to remove self reference