fix queue issues