fix to order queue