diff --git a/include/kiwi/Types.h b/include/kiwi/Types.h
index 64c739f9..f8769c0f 100644
--- a/include/kiwi/Types.h
+++ b/include/kiwi/Types.h
@@ -1,4 +1,4 @@
-/**
+/**
  * @file Types.h
  * @author bab2min (bab2min@gmail.com)
  * @brief Kiwi C++ API에 쓰이는 주요 타입들을 모아놓은 헤더 파일
diff --git a/src/Joiner.cpp b/src/Joiner.cpp
index 03dce00a..c80eb13a 100644
--- a/src/Joiner.cpp
+++ b/src/Joiner.cpp
@@ -27,6 +27,7 @@ namespace kiwi
 			if (l == POSTag::sso || l == POSTag::ssc) return false;
 			if (r == POSTag::sso) return true;
 			if ((isJClass(l) || isEClass(l)) && r == POSTag::ss) return true;
+			if (l == POSTag::z_siot && isNNClass(r)) return false;
 
 			if (r == POSTag::vx && rform.size() == 1 && (rform[0] == u'하' || rform[0] == u'지')) return false;