UID check fix