fixed transform functions in Handshake class