forgot to do the same for queue