diff --git a/src/com/esotericsoftware/kryo/io/InputChunked.java b/src/com/esotericsoftware/kryo/io/InputChunked.java
index bcaab0808..b09c2e847 100644
--- a/src/com/esotericsoftware/kryo/io/InputChunked.java
+++ b/src/com/esotericsoftware/kryo/io/InputChunked.java
@@ -99,6 +99,7 @@ private boolean readChunkSize () {
 	/** Advances the stream to the next set of chunks. InputChunked will appear to hit the end of the data until this method is
 	 * called. */
 	public void nextChunks () {
+		position = limit; // Underflow resets the position to 0. Ensure we are at the end of the chunk.
 		if (chunkSize == -1) readChunkSize(); // No current chunk, expect a new chunk.
 		while (chunkSize > 0)
 			skip(chunkSize);
diff --git a/test/com/esotericsoftware/kryo/ChunkedTest.java b/test/com/esotericsoftware/kryo/ChunkedTest.java
index 4c1c47b6d..e679a5e20 100644
--- a/test/com/esotericsoftware/kryo/ChunkedTest.java
+++ b/test/com/esotericsoftware/kryo/ChunkedTest.java
@@ -1,59 +1,82 @@
-/* Copyright (c) 2008, Nathan Sweet
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
- * conditions are met:
- * 
- * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the distribution.
- * - Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
-package com.esotericsoftware.kryo;
-
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.InputChunked;
-import com.esotericsoftware.kryo.io.Output;
-import com.esotericsoftware.kryo.io.OutputChunked;
-
-/** @author Nathan Sweet <misc@n4te.com> */
-public class ChunkedTest extends KryoTestCase {
-	public void testChunks () {
-		Output output = new Output(512);
-		output.writeInt(1234);
-		OutputChunked outputChunked = new OutputChunked(output);
-		outputChunked.writeInt(1);
-		outputChunked.endChunks();
-		outputChunked.writeInt(2);
-		outputChunked.endChunks();
-		outputChunked.writeInt(3);
-		outputChunked.endChunks();
-		outputChunked.writeInt(4);
-		outputChunked.endChunks();
-		outputChunked.writeInt(5);
-		outputChunked.endChunks();
-		output.writeInt(5678);
-		output.close();
-
-		Input input = new Input(output.getBuffer());
-		assertEquals(1234, input.readInt());
-		InputChunked inputChunked = new InputChunked(input);
-		assertEquals(1, inputChunked.readInt());
-		inputChunked.nextChunks();
-		inputChunked.nextChunks(); // skip 3
-		assertEquals(3, inputChunked.readInt());
-		inputChunked.nextChunks();
-		inputChunked.nextChunks(); // skip 4
-		assertEquals(5, inputChunked.readInt());
-		assertEquals(5678, input.readInt());
-		input.close();
-	}
-}
+/* Copyright (c) 2008, Nathan Sweet
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
+ * conditions are met:
+ * 
+ * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the distribution.
+ * - Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+package com.esotericsoftware.kryo;
+
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.InputChunked;
+import com.esotericsoftware.kryo.io.Output;
+import com.esotericsoftware.kryo.io.OutputChunked;
+
+/** @author Nathan Sweet <misc@n4te.com> */
+public class ChunkedTest extends KryoTestCase {
+	public void testChunks () {
+		Output output = new Output(512);
+		output.writeInt(1234);
+		OutputChunked outputChunked = new OutputChunked(output);
+		outputChunked.writeInt(1);
+		outputChunked.endChunks();
+		outputChunked.writeInt(2);
+		outputChunked.endChunks();
+		outputChunked.writeInt(3);
+		outputChunked.endChunks();
+		outputChunked.writeInt(4);
+		outputChunked.endChunks();
+		outputChunked.writeInt(5);
+		outputChunked.endChunks();
+		output.writeInt(5678);
+		output.close();
+
+		Input input = new Input(output.getBuffer());
+		assertEquals(1234, input.readInt());
+		InputChunked inputChunked = new InputChunked(input);
+		assertEquals(1, inputChunked.readInt());
+		inputChunked.nextChunks();
+		inputChunked.nextChunks(); // skip 3
+		assertEquals(3, inputChunked.readInt());
+		inputChunked.nextChunks();
+		inputChunked.nextChunks(); // skip 4
+		assertEquals(5, inputChunked.readInt());
+		assertEquals(5678, input.readInt());
+		input.close();
+	}
+	
+	public void testSkipAfterUnderFlow () {
+		Output output = new Output(512);
+		OutputChunked outputChunked = new OutputChunked(output);
+		outputChunked.writeInt(1);
+		outputChunked.endChunks();
+		outputChunked.writeInt(2);
+		outputChunked.endChunks();
+		output.close();
+
+		Input input = new Input(output.getBuffer());
+		InputChunked inputChunked = new InputChunked(input);
+		assertEquals(1, inputChunked.readInt());
+		// trigger buffer underflow
+		try {
+			inputChunked.readInt();
+			fail();
+		} catch (KryoException ignored) {
+		}
+		inputChunked.nextChunks();
+		assertEquals(2, inputChunked.readInt());
+		input.close();
+	}
+}