diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d775d91..48666d2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Use Node 12
+      - name: Use Node 16
         uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 16
 
       - name: Cache node modules
         id: cache-nodemodules
diff --git a/mkDocs.sh b/mkDocs.sh
index 722cd8e..fb62b52 100755
--- a/mkDocs.sh
+++ b/mkDocs.sh
@@ -6,7 +6,7 @@ mkdir target
 mkdir target/generated-docs
 
 ## GENERATE THE DOCUMENTATION ##
-docker run -a STDERR --rm -i -v `pwd`:/docs gisaia/typedocgen:0.0.7 generatedoc src
+docker run -a STDERR --rm -i -v `pwd`:/docs gisaia/typedocgen:0.0.8 generatedoc src
 
 ## MOVE ALL THE DOCUMENTATION TO THE 'generated-docs' FOLDER ##
 if [ -z "$(ls -A ./typedoc_docs)" ]; then
diff --git a/src/histograms/charts/AbstractChart.ts b/src/histograms/charts/AbstractChart.ts
index b7c44d5..6f5d902 100644
--- a/src/histograms/charts/AbstractChart.ts
+++ b/src/histograms/charts/AbstractChart.ts
@@ -82,8 +82,8 @@ export abstract class AbstractChart extends AbstractHistogram {
       this.initializeDescriptionValues(minMaxBorders[0], minMaxBorders[1], this.histogramParams.bucketRange);
       this.initializeChartDimensions();
       this.customizeData(data);
-      const extendData = this.extendData(data);
-      this.createChartAxes(extendData);
+      const extendedData = this.extendData(data);
+      this.createChartAxes(extendedData);
       this.drawChartAxes(this.chartAxes, 0);
       this.plotChart(data);
       this.showTooltips(data);
@@ -895,8 +895,10 @@ export abstract class AbstractChart extends AbstractHistogram {
     }
 
     extendedData = extendedData.concat(data);
-    if (+data[data.length - 1].key < +this.selectionInterval.endvalue) {
-      let fakeDataKey = +data[data.length - 1].key;
+    // We need to add a bucket only if the start of the next bucket
+    // is not in the data but included in the selection
+    if (+data[data.length - 1].key + bucketSize < +this.selectionInterval.endvalue) {
+      let fakeDataKey = +data[data.length - 1].key + bucketSize;
       while (fakeDataKey < +this.selectionInterval.endvalue) {
         fakeDataKey += +bucketSize;
         if (this.histogramParams.dataType === DataType.numeric) {