fix queue pollution