diff --git a/ext/upload/main.php b/ext/upload/main.php
index a7715752..40a06268 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -332,7 +332,7 @@ class Upload extends Extension
 
         // blank file boxes cause empty uploads, no need for error message
         if (!empty($file['name'])) {
-            $size = sizeof($file['name']);
+            $size = count($file['name']);
             $limit = $config->get_int(UploadConfig::COUNT);
             try {
                 if ($size > $limit) {
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index b2c9fb33..65fa5a05 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -152,7 +152,7 @@ class UploadTheme extends Themelet
         $upload_list = "
 			<tr>
 				<td>File</td>
-				<td><input name='data' type='file' accept='$accept'></td>
+				<td><input name='data[]' type='file' accept='$accept'></td>
 			</tr>
 		";
         if ($tl_enabled) {