Fix queue creation