fixed a bug with uniqueid's