Fix problem with duplicate sha-1 ids being produced