diff --git a/Dockerfile b/Dockerfile
index 07aa6ddec..b1a667d67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ RUN git clone https://github.com/jekkos/opensourcepos.git /app
 # RUN cd app && npm install
 
 RUN ln -fs /app/* /var/www
+RUN rm /var/www/index.html
 ADD ./start_container.sh /start_container.sh
 RUN chmod 755 /start_container.sh
 EXPOSE 80 3306
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index e573d4285..9a0db9664 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -512,14 +512,16 @@ class CI_Pagination {
 			{
 				$this->cur_page = str_replace(array($this->prefix, $this->suffix), '', $this->cur_page);
 			}
-		}
+        } else {
+            $this->cur_page = (string) $this->cur_page;
+        }
 
 		// If something isn't quite right, back to the default base page.
 		if ( ! ctype_digit($this->cur_page) OR ($this->use_page_numbers && (int) $this->cur_page === 0))
 		{
 			$this->cur_page = $base_page;
 		}
-		else
+		elseif (empty($this->cur_page))
 		{
 			// Make sure we're using integers for comparisons later.
 			$this->cur_page = (int) $this->cur_page;