fix queueing