fixed queue issues