Bug Fix of Finish Queue