Solved Queue issues