diff --git a/select.inc.php b/select.inc.php
index ccf75a68..9b378f63 100644
--- a/select.inc.php
+++ b/select.inc.php
@@ -49,10 +49,8 @@ foreach ((array) $_GET["where"] as $val) {
 }
 $order = array();
 foreach ((array) $_GET["order"] as $key => $val) {
-	if (in_array($val, $columns, true)) {
+	if (in_array($val, $columns, true) || preg_match('(^(COUNT\\(\\*\\)|(' . strtoupper(implode('|', $functions) . '|' . implode('|', $grouping)) . ')\\((' . implode('|', array_map('preg_quote', array_map('idf_escape', $columns))) . ')\\))$)', $val)) {
 		$order[] = idf_escape($val) . (isset($_GET["desc"][$key]) ? " DESC" : "");
-	} elseif (preg_match('(^(COUNT\\(\\*\\)|(' . strtoupper(implode('|', $functions) . '|' . implode('|', $grouping)) . ')\\((' . implode('|', array_map('preg_quote', array_map('idf_escape', $columns))) . ')\\))$)', $val)) {
-		$order[] = $val . (isset($_GET["desc"][$key]) ? " DESC" : "");
 	}
 }
 $limit = (isset($_GET["limit"]) ? $_GET["limit"] : "30");