diff --git a/src/server/player_sao.h b/src/server/player_sao.h
index a75f2bd3c..030ed2516 100644
--- a/src/server/player_sao.h
+++ b/src/server/player_sao.h
@@ -183,6 +183,7 @@ private:
 	std::string generateUpdatePhysicsOverrideCommand() const;
 
 	RemotePlayer *m_player = nullptr;
+	// Replace with m_player->getName method from m_player cause SIGSEG
 	std::string m_player_name; ///< used as GUID
 	session_t m_peer_id_initial = 0; ///< only used to initialize RemotePlayer
 
diff --git a/src/util/guid.cpp b/src/util/guid.cpp
index 97f20607f..dda92fee9 100644
--- a/src/util/guid.cpp
+++ b/src/util/guid.cpp
@@ -29,11 +29,8 @@ void MyGUID::deSerialize(std::istream &is)
 GUIDGenerator::GUIDGenerator() :
 	m_uniform(0, UINT64_MAX)
 {
-	if (m_rand.entropy() <= 0.01)
-		warningstream <<
-				"The system's provided random generator reports low entropy."
-				"GUID generator can be affected. Suggest a system upgrade."
-				<< std::endl;
+	std::random_device rd;
+	m_rand.seed(rd());
 }
 
 MyGUID GUIDGenerator::next()
diff --git a/src/util/guid.h b/src/util/guid.h
index 8bfff7454..e9570d889 100644
--- a/src/util/guid.h
+++ b/src/util/guid.h
@@ -42,6 +42,6 @@ public:
 
 private:
 
-	std::random_device m_rand;
+	std::mt19937_64 m_rand;
 	std::uniform_int_distribution<u64> m_uniform;
 };