Fix how the UID command works