Changes to avoid handshake error.