Fix bug with exchanging queue