Second fix
Shorter queue