Removed double getQueue call
Fix conflicts.