Try to fix queue memory leak