improved queue handling -> avoid "Queue is full" error