Fixing a bug in the queue caused by the last commit