Queue glitch fix