diff --git a/code/GenericDataAdmin.php b/code/GenericDataAdmin.php
index c0fbbc60..e979114e 100755
--- a/code/GenericDataAdmin.php
+++ b/code/GenericDataAdmin.php
@@ -477,7 +477,7 @@ HTML;
 				$fileData .= "\n";
 			}
 
-			HTTP::sendFileToBrowser($fileData, $fileName);
+			return HTTPRequest::send_file($fileData, $fileName);
 		} else {
 			user_error("No records found", E_USER_ERROR);
 		}
diff --git a/code/StaticExporter.php b/code/StaticExporter.php
index 8618e00a..34c2bda5 100755
--- a/code/StaticExporter.php
+++ b/code/StaticExporter.php
@@ -92,8 +92,7 @@ class StaticExporter extends Controller {
 			$content = file_get_contents("/tmp/static-export/$baseFolder.tar.gz");
 			Filesystem::removeFolder('/tmp/static-export');
 
-			HTTP::sendFileToBrowser($content, "$baseFolder.tar.gz");
-			return null;
+			return HTTPRequest::send_file($content, "$baseFolder.tar.gz");
 			
 		} else {
 			echo _t('StaticExporter.ONETHATEXISTS',"Please specify a folder that exists");