2 files changed, 4 insertions, 3 deletions

diff --git a/frontend/utility.go b/frontend/utility.go
index 28e7db1..6dbef6a 100644
--- a/frontend/utility.go
+++ b/frontend/utility.go
@@ -13,7 +13,7 @@ func PaginationFromPage(pageRange, currentPage, maxPage int) PaginationRange {
         var after []int
 
         startPage := currentPage - pageRange
-        endPage := currentPage + pageRange + 1
+        endPage := currentPage + pageRange
 
         if startPage < 1 {
                 endPage += -startPage + 1
@@ -36,7 +36,7 @@ func PaginationFromPage(pageRange, currentPage, maxPage int) PaginationRange {
                 before = append(before, i)
         }
 
-        for i := currentPage + 1; i < endPage; i++ {
+        for i := currentPage + 1; i < endPage+1; i++ {
                 after = append(after, i)
         }
 
diff --git a/modules/tags/tags.go b/modules/tags/tags.go
index 650fa4e..4019f8a 100644
--- a/modules/tags/tags.go
+++ b/modules/tags/tags.go
@@ -2,6 +2,7 @@ package tags
 
 import (
         "log"
+        "math"
         "net/http"
         "strconv"
 
@@ -77,7 +78,7 @@ func (m *Module) viewTagPage(w http.ResponseWriter, r *http.Request, p httproute
                 http.Redirect(w, r, "/", 302)
                 return
         }
-        pageCount := (int)((float64)(pageNum)/12.0 + 0.5)
+        pageCount := (int)(math.Ceil(float64(pageNum) / 12.0))
 
         if pageNumber > pageCount {
                 pageNumber = pageCount