bugfix in initial handshake and 9.x