Commiting a fix to the uniqueid implementation.