diff --git a/configure.in b/configure.in
index 202ca0d8..7cdb99df 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(msgpack/unpack_template.h)
 AC_CONFIG_AUX_DIR(ac)
-AM_INIT_AUTOMAKE(msgpack, 0.3.5)
+AM_INIT_AUTOMAKE(msgpack, 0.3.6)
 AC_CONFIG_HEADER(config.h)
 
 AC_SUBST(CFLAGS)
diff --git a/cpp/type/bool.hpp b/cpp/type/bool.hpp
index f3ac6fa3..b945d856 100644
--- a/cpp/type/bool.hpp
+++ b/cpp/type/bool.hpp
@@ -31,7 +31,6 @@ inline bool& operator>> (object o, bool& v)
 	return v;
 }
 
-
 template <typename Stream>
 inline packer<Stream>& operator<< (packer<Stream>& o, const bool& v)
 {
diff --git a/cpp/type/set.hpp b/cpp/type/set.hpp
index 3f1920a3..11db2b3f 100644
--- a/cpp/type/set.hpp
+++ b/cpp/type/set.hpp
@@ -37,7 +37,6 @@ inline std::set<T>& operator>> (object o, std::set<T>& v)
 	return v;
 }
 
-
 template <typename Stream, typename T>
 inline packer<Stream>& operator<< (packer<Stream>& o, const std::set<T>& v)
 {
diff --git a/cpp/type/string.hpp b/cpp/type/string.hpp
index 2a230585..a085d535 100644
--- a/cpp/type/string.hpp
+++ b/cpp/type/string.hpp
@@ -26,9 +26,8 @@ namespace msgpack {
 
 inline std::string& operator>> (object o, std::string& v)
 {
-	type::raw_ref r;
-	o >> r;
-	v.assign(r.ptr, r.size);
+	if(o.type != type::RAW) { throw type_error(); }
+	v.assign(o.via.raw.ptr, o.via.raw.size);
 	return v;
 }