Fix UUID handshake regression
Not required