diff --git a/MinecraftClient/MinecraftClient.csproj b/MinecraftClient/MinecraftClient.csproj
index 30ef5863..ea332a12 100644
--- a/MinecraftClient/MinecraftClient.csproj
+++ b/MinecraftClient/MinecraftClient.csproj
@@ -289,7 +289,6 @@
     <Content Include="Protocol\Dns\Records\totla.txt" />
     <Content Include="Resources\AppIcon.ico" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MinecraftClient/MinecraftClient.csproj.user b/MinecraftClient/MinecraftClient.csproj.user
index 58130d8e..c0a75d71 100644
--- a/MinecraftClient/MinecraftClient.csproj.user
+++ b/MinecraftClient/MinecraftClient.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <StartArguments>test - 192.168.1.29</StartArguments>
+    <StartArguments>TestBot - localhost</StartArguments>
   </PropertyGroup>
   <PropertyGroup>
     <PublishUrlHistory>publish\</PublishUrlHistory>
diff --git a/MinecraftClient/Protocol/Handlers/DataTypes.cs b/MinecraftClient/Protocol/Handlers/DataTypes.cs
index 3b8c36fa..dc51c412 100644
--- a/MinecraftClient/Protocol/Handlers/DataTypes.cs
+++ b/MinecraftClient/Protocol/Handlers/DataTypes.cs
@@ -412,6 +412,18 @@ namespace MinecraftClient.Protocol.Handlers
             return bytes.ToArray();
         }
 
+        /// <summary>
+        /// Get byte array representing a short
+        /// </summary>
+        /// <param name="number">Short to process</param>
+        /// <returns>Array ready to send</returns>
+        public byte[] GetShort(short number)
+        {
+            byte[] theShort = BitConverter.GetBytes(number);
+            Array.Reverse(theShort);
+            return theShort;
+        }
+
         /// <summary>
         /// Get byte array representing a double
         /// </summary>
diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs
index 93593985..152910e6 100644
--- a/MinecraftClient/Protocol/Handlers/Protocol18.cs
+++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs
@@ -1366,10 +1366,7 @@ namespace MinecraftClient.Protocol.Handlers
             try
             {
                 List<byte> packet = new List<byte>();
-                // short to byte (?
-                byte[] b = BitConverter.GetBytes(slot);
-                Array.Reverse(b);
-                packet.AddRange(b);
+                packet.AddRange(dataTypes.GetShort(slot));
                 SendPacket(PacketOutgoingType.HeldItemChange, packet);
                 return true;
             }