diff --git a/haruhi_dl/extractor/youtube.py b/haruhi_dl/extractor/youtube.py
index 9fa590754..a604de75b 100644
--- a/haruhi_dl/extractor/youtube.py
+++ b/haruhi_dl/extractor/youtube.py
@@ -1025,9 +1025,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         return a
 
     def _full_signature_handling(self, sig, player_url, video_id):
-        signature = _decrypt_signature_protected(sig)
-        if re.match(self._VALID_SIG_VALUE_RE, signature):
-            return signature
+        if _decrypt_signature_protected:
+            signature = _decrypt_signature_protected(sig)
+            if re.match(self._VALID_SIG_VALUE_RE, signature):
+                return signature
         if self._downloader.params.get('verbose'):
             self.to_screen("Built-in signature decryption failed, trying dynamic")
         sig_decrypt_stack = self._extract_signature_function(video_id, player_url)
diff --git a/setup.py b/setup.py
index ac22df08c..892f49bf4 100755
--- a/setup.py
+++ b/setup.py
@@ -115,7 +115,7 @@ setup(
     packages=[
         'haruhi_dl',
         'haruhi_dl.extractor', 'haruhi_dl.downloader',
-        'haruhi_dl.postprocessor'],
+        'haruhi_dl.postprocessor', 'haruhi_dl.extractor_artifacts'],
 
     # Provokes warning on most systems (why?!)
     # test_suite = 'nose.collector',