Fixed queue a little bit