Queue limitations fix