diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 05b8d715a2..4c8d9e68ca 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -1444,10 +1444,10 @@ class WP_Rewrite {
 					$subcommentquery = $subquery . '&cpage=' . $this->preg_index(2);
 
 					//do endpoints for attachments
-					if ( !empty($endpoint) ) { foreach ( (array) $ep_query_append as $regex => $ep ) {
+					if ( !empty($endpoints) ) { foreach ( (array) $ep_query_append as $regex => $ep ) {
 						if ($ep[0] & EP_ATTACHMENT) {
-							$rewrite[$sub1 . $regex] = $subquery . '?' . $ep[1] . $this->preg_index(2);
-							$rewrite[$sub2 . $regex] = $subquery . '?' . $ep[1] . $this->preg_index(2);
+							$rewrite[$sub1 . $regex] = $subquery . $ep[1] . $this->preg_index(2);
+							$rewrite[$sub2 . $regex] = $subquery . $ep[1] . $this->preg_index(2);
 						}
 					} }