diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 9028fe5aa..13a01f234 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -832,7 +832,7 @@ class StoredFile {
                 // ." AND m.id = $dir_id";
         $sql = "SELECT filepath as fp"
                 ." FROM CC_FILES"
-                ." WHERE f.directory = $dir_id";                
+                ." WHERE directory = $dir_id";                
              
         $rows = $CC_DBC->getAll($sql);
 
diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
index e4f87f18b..3575b394a 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
@@ -97,13 +97,13 @@ class AirtimeMediaMonitorBootstrap():
             self.pe.handle_removed_file(False, "%s/%s" % (dir, file_path))
                 
         for file_path in new_files_set:
+            file_path = "%s/%s" % (dir, file_path)
             if os.path.exists(file_path):
-                file_path = "%s/%s" % (dir, file_path)
                 self.pe.handle_created_file(False, os.path.basename(file_path), file_path)
                 
         for file_path in modified_files_set:
+            file_path = "%s/%s" % (dir, file_path)
             if os.path.exists(file_path):
-                file_path = "%s/%s" % (dir, file_path)
                 self.pe.handle_modified_file(False, os.path.basename(file_path), file_path)
                             
     def execCommand(self, command):