fix queue issual