diff --git a/java/build.xml b/java/build.xml
index 40d7d614..b98f7c38 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -13,6 +13,6 @@
 		</javac>
 	</target>
 	<target name="jar" depends="compile">
-		<jar jarfile="dist/msgpack-0.0.0.jar" basedir="build" />
+		<jar jarfile="dist/msgpack-0.0.1.jar" basedir="build" />
 	</target>
 </project>
diff --git a/java/src/org/msgpack/Packer.java b/java/src/org/msgpack/Packer.java
index ebd84022..935728d2 100644
--- a/java/src/org/msgpack/Packer.java
+++ b/java/src/org/msgpack/Packer.java
@@ -20,7 +20,6 @@ package org.msgpack;
 import java.io.OutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Map;
 
diff --git a/java/src/org/msgpack/impl/UnpackerImpl.java b/java/src/org/msgpack/impl/UnpackerImpl.java
index ddf99400..adc62b09 100644
--- a/java/src/org/msgpack/impl/UnpackerImpl.java
+++ b/java/src/org/msgpack/impl/UnpackerImpl.java
@@ -385,11 +385,11 @@ public class UnpackerImpl {
 						obj = new Object[count*2];
 						if(count == 0) { break _push; }  // FIXME check IMapSchema
 						//System.out.println("fixmap count:"+count);
+						++top;
 						stack_obj[top]    = top_obj;
 						stack_ct[top]     = top_ct;
 						stack_count[top]  = top_count;
 						stack_schema[top] = top_schema;
-						++top;
 						top_obj    = obj;
 						top_ct     = CT_MAP_KEY;
 						top_count  = count;