diff --git a/Changes b/Changes
index a06290b..fb182b8 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,9 @@
 AMCC Change Log
 v1.10.0
 
+[+] Fixed:
+  - Server List Ping is now improved
+
 [+] Added:
   - New preferences file format
   - "About" information
diff --git a/amcc-protocol/src/main/java/net/defekt/mc/chatclient/protocol/MinecraftStat.java b/amcc-protocol/src/main/java/net/defekt/mc/chatclient/protocol/MinecraftStat.java
index 63a8000..cc60a2b 100644
--- a/amcc-protocol/src/main/java/net/defekt/mc/chatclient/protocol/MinecraftStat.java
+++ b/amcc-protocol/src/main/java/net/defekt/mc/chatclient/protocol/MinecraftStat.java
@@ -69,7 +69,8 @@ public static StatusInfo serverListPing(final String host, final int port, final
             final OutputStream os = soc.getOutputStream();
             final VarInputStream is = new VarInputStream(soc.getInputStream());
 
-            final Packet handshake = new HandshakePacket(PacketFactory.constructPacketRegistry(47), -1, host, port, 1);
+            final Packet handshake = new HandshakePacket(PacketFactory.constructPacketRegistry(47),
+                    ProtocolNumber.values()[0].protocol, host, port, 1);
             os.write(handshake.getData(false));
             os.write(0x01);
             os.write(0x00);
diff --git a/amcc-protocol/src/main/java/net/defekt/mc/chatclient/protocol/data/ServerEntry.java b/amcc-protocol/src/main/java/net/defekt/mc/chatclient/protocol/data/ServerEntry.java
index cd70b41..1371a90 100644
--- a/amcc-protocol/src/main/java/net/defekt/mc/chatclient/protocol/data/ServerEntry.java
+++ b/amcc-protocol/src/main/java/net/defekt/mc/chatclient/protocol/data/ServerEntry.java
@@ -86,6 +86,7 @@ public void run() {
                             try {
                                 info = MinecraftStat.serverListPing(host, port);
                             } catch (final Exception e) {
+                                e.printStackTrace();
                                 info = MinecraftStat.legacyServerListPing(host, port);
                             }
                         }