Cleard Bug in UID correction