Fix removal from waiting group