fixes handshake ordering issue with ut_metadata