Fixed for the latest UU version