diff --git a/src/main/java/ch/eitchnet/utils/collections/Paging.java b/src/main/java/ch/eitchnet/utils/collections/Paging.java
index a649217a7..7031c34e4 100644
--- a/src/main/java/ch/eitchnet/utils/collections/Paging.java
+++ b/src/main/java/ch/eitchnet/utils/collections/Paging.java
@@ -93,9 +93,9 @@ public class Paging<T> {
 		paging.nrOfElements = list.size();
 
 		if (paging.pageSize <= 0 || paging.pageToReturn <= 0) {
-			paging.nrOfPages = 1;
+			paging.nrOfPages = 0;
 			paging.pageSize = list.size();
-			paging.pageToReturn = 1;
+			paging.pageToReturn = 0;
 			paging.input = list;
 			paging.page = list;
 			return paging;
@@ -118,6 +118,10 @@ public class Paging<T> {
 		// and return the list
 		paging.page = list.subList(start, end);
 
+		// fix page size
+		if (paging.page.size() < paging.pageSize)
+			paging.pageSize = paging.page.size();
+
 		return paging;
 	}
 }