Fix #1011

Caveat, UUID is not selectable anymore