diff --git a/Queue.h b/Queue.h
index 316084a9..85114bc1 100644
--- a/Queue.h
+++ b/Queue.h
@@ -118,7 +118,7 @@ namespace util
 			
 		private:
 			std::thread m_Thread;
-			int running;
+			volatile int running;
 	};	
 }		
 }	
diff --git a/i2p.cpp b/i2p.cpp
index 97914b5e..967435cb 100644
--- a/i2p.cpp
+++ b/i2p.cpp
@@ -26,8 +26,8 @@
 
 
 // Global
-int running = 1;
-int isDaemon;
+volatile int running = 1;
+volatile int isDaemon;
 
 #ifndef _WIN32
 void handle_signal(int sig)
@@ -60,7 +60,7 @@ void handle_signal(int sig)
 int main( int argc, char* argv[] )
 {
   i2p::util::config::OptionParser(argc,argv);
-  isDaemon = i2p::util::config::GetArg("-daemon", 0);
+  volatile int isDaemon = i2p::util::config::GetArg("-daemon", 0);
 #ifdef _WIN32
   setlocale(LC_CTYPE, "");
   SetConsoleCP(1251);
@@ -73,7 +73,7 @@ int main( int argc, char* argv[] )
   LogPrint("data directory: ", i2p::util::filesystem::GetDataDir().string());
   i2p::util::filesystem::ReadConfigFile(i2p::util::config::mapArgs, i2p::util::config::mapMultiArgs);
 
-  int isLogging = i2p::util::config::GetArg("-log", 0);
+  volatile int isLogging = i2p::util::config::GetArg("-log", 0);
   if (isLogging == 1)
   {
     std::string logfile = i2p::util::filesystem::GetDataDir().string();