fix handshake when enums are present
1.1.1