diff --git a/Random.cpp b/Random.cpp
index 06d2bc1..ad087a7 100644
--- a/Random.cpp
+++ b/Random.cpp
@@ -29,10 +29,10 @@ CRandom::CRandom()
 
 CRandom::~CRandom() {}
 
-short CRandom::NewStreamID()
+unsigned short CRandom::NewStreamID()
 {
-	short r = 0;
+	unsigned short r = 0;
 	while (0 == r)
-		r = 0xffff & random();
+		r = 0xffffu & random();
 	return r;
 }
diff --git a/Random.h b/Random.h
index cbda881..390830d 100644
--- a/Random.h
+++ b/Random.h
@@ -25,5 +25,5 @@ public:
 
 	~CRandom();
 
-	short NewStreamID();
+	unsigned short NewStreamID();
 };