Fix the Queue BUG