Uvs ready to be merge

Trivial, but handle this with an else.