fix queue
dirty hack