diff --git a/LogMonitor/src/LogMonitor/LogFileMonitor.cpp b/LogMonitor/src/LogMonitor/LogFileMonitor.cpp
index 6c39f10..51f880b 100644
--- a/LogMonitor/src/LogMonitor/LogFileMonitor.cpp
+++ b/LogMonitor/src/LogMonitor/LogFileMonitor.cpp
@@ -37,6 +37,7 @@ using namespace std;
 /// \param LogDirectory:        The log directory to be monitored
 /// \param Filter:              The filter to apply when looking fr log files
 /// \param IncludeSubfolders:   TRUE if subdirectories also needs to be monitored
+/// \param WaitInSeconds:       Waiting time in seconds to retry if folder/file to be monitored does not exist
 ///
 LogFileMonitor::LogFileMonitor(_In_ const std::wstring& LogDirectory,
                                _In_ const std::wstring& Filter,
@@ -811,7 +812,7 @@ LogFileMonitor::LogFilesChangeHandler()
     const DWORD eventsCount = 3;
 
     LARGE_INTEGER liDueTime;
-    INT64 millisecondsToWait = 30000LL;
+    INT64 millisecondsToWait = 1000LL;
     liDueTime.QuadPart = -millisecondsToWait*10000LL; // wait time in 100 nanoseconds
 
     HANDLE timerEvent = CreateWaitableTimer(NULL, FALSE, NULL);
@@ -1010,6 +1011,8 @@ LogFileMonitor::LogFilesChangeHandler()
         }
     }
 
+    CloseHandle(timerEvent);
+
     return status;
 }