Fixed UU compatibility