fixing queue issues