fix + reformat first item queueing