diff --git a/source/lib/DownloadDispatcher/Utility/MediaFilesIterator.class.php b/source/lib/DownloadDispatcher/Utility/MediaFilesIterator.class.php
index 1ce7df2..b5c8d62 100644
--- a/source/lib/DownloadDispatcher/Utility/MediaFilesIterator.class.php
+++ b/source/lib/DownloadDispatcher/Utility/MediaFilesIterator.class.php
@@ -1,8 +1,14 @@
 <?php                                                                                                                                                                             
                                                                                                                                                                                   
 class DownloadDispatcher_Utility_MediaFilesIterator extends FilterIterator {                                                                                                            
-    public function accept() {                                                                                                                                                    
-        return preg_match('/(?<!\.sample)\.(?:avi|ogm|m4v|mkv|mov|mp4|mpg|srt|rar)$/i', $this->current()->getFilename());                                                                          
+    public function accept() {
+        $filename = $this->current()->getFilename();                              
+        if (preg_match('/^sample/', $filename)) {
+            return false;
+        }
+        if (preg_match('/(?<!(?:\.|-)sample)\.(?:avi|ogm|m4v|mkv|mov|mp4|mpg|srt|rar)$/i', $filename)) {
+            return true;
+        }
     }                                                                                                                                                                             
 }