diff --git a/src/c-wrapper/c-wrapper.h b/src/c-wrapper/c-wrapper.h
index fed96f8df..531f03f0a 100644
--- a/src/c-wrapper/c-wrapper.h
+++ b/src/c-wrapper/c-wrapper.h
@@ -41,6 +41,7 @@
 	F(Participant, Participant)
 
 #define L_REGISTER_SUBTYPES(F) \
+	F(ChatRoom, BasicChatRoom) \
 	F(ChatRoom, ClientGroupChatRoom) \
 	F(ChatRoom, RealTimeTextChatRoom)
 
diff --git a/src/c-wrapper/internal/c-tools.h b/src/c-wrapper/internal/c-tools.h
index 788d090b3..6f05c5759 100644
--- a/src/c-wrapper/internal/c-tools.h
+++ b/src/c-wrapper/internal/c-tools.h
@@ -143,7 +143,7 @@ public:
 
 	template<
 		typename CppType,
-		typename = typename std::enable_if<std::is_base_of<Object, CppType>::value, CppType>::type
+		typename = typename std::enable_if<IsDefinedNotClonableCppObject<CppType>::value, CppType>::type
 	>
 	static inline void setCppPtrFromC (void *cObject, const std::shared_ptr<CppType> &cppObject) {
 		static_cast<WrappedObject<CppType> *>(cObject)->cppPtr = cppObject;
@@ -152,7 +152,7 @@ public:
 
 	template<
 		typename CppType,
-		typename = typename std::enable_if<std::is_base_of<ClonableObject, CppType>::value, CppType>::type
+		typename = typename std::enable_if<IsDefinedClonableCppObject<CppType>::value, CppType>::type
 	>
 	static inline void setCppPtrFromC (void *cObject, const CppType *cppObject) {
 		CppType **cppObjectAddr = &static_cast<WrappedClonableObject<CppType> *>(cObject)->cppPtr;