diff --git a/include/bx/thread.h b/include/bx/thread.h
index 6d78bc5..79bdb09 100644
--- a/include/bx/thread.h
+++ b/include/bx/thread.h
@@ -72,7 +72,7 @@ namespace bx
 		uint32_t  m_stackSize;
 		int32_t   m_exitCode;
 		bool      m_running;
-		char      m_name[32];
+		char      m_name[64];
 	};
 
 	///
diff --git a/src/thread.cpp b/src/thread.cpp
index 9a0f2fb..c5c4f81 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -132,14 +132,15 @@ namespace bx
 		m_userData = _userData;
 		m_stackSize = _stackSize;
 
-        if (NULL != _name)
-        {
-            strCopy(m_name, sizeof(m_name), _name);
-        }
-        else
-        {
-            m_name[0] = '\0';
-        }
+		if (NULL != _name)
+		{
+			BX_WARN(strLen(_name) < BX_COUNTOF(m_name)-1, "Truncating thread name.");
+			strCopy(m_name, BX_COUNTOF(m_name), _name);
+		}
+		else
+		{
+			m_name[0] = '\0';
+		}
 
 		ThreadInternal* ti = (ThreadInternal*)m_internal;
 #if BX_CRT_NONE