better UID handling...