Fixed default queue only bug