Bug correction (duplicates in queue)