Fix logic in UV interface (again)