diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index f7e27121..bf1c7662 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -967,10 +967,9 @@ class Tag {
 			// do nothing
 		//}
 
-		$tags = array_map("trim", $tags);
-
 		$tag_array = array();
 		foreach($tags as $tag) {
+			$tag = trim($tag, ", \t\n\r\0\x0B");
 			if(is_string($tag) && !empty($tag)) {
 				$tag_array[] = $tag;
 			}