diff --git a/src/generatePrefixesList.js b/src/generatePrefixesList.js
index 8b3c347..42e9274 100644
--- a/src/generatePrefixesList.js
+++ b/src/generatePrefixesList.js
@@ -142,6 +142,8 @@ module.exports = function generatePrefixes(inputParameters) {
         getMultipleOrigins(prefix)
             .then(asns => {
 
+                let origins = [parseInt(asn)];
+
                 if (asns && asns.length) {
                     const origin = (asns && asns.length) ? asns : [asn];
 
@@ -149,14 +151,19 @@ module.exports = function generatePrefixes(inputParameters) {
                         allOrigins[o] = true;
                     }
 
-                    generateList[prefix] = {
-                        description: description || "No description provided",
-                        asn: origin.map(i => parseInt(i)),
-                        ignoreMorespecifics: ignoreMorespecifics,
-                        ignore: excludeDelegated,
-                        group: group || "default"
-                    };
+                    origins = origin.map(i => parseInt(i));
+                } else {
+                    logger("RIPEstat is having issues in returning the origin ASes of some prefixes. The prefix.yml configuration may be incomplete.");
                 }
+
+                generateList[prefix] = {
+                    description: description || "No description provided",
+                    asn: origins,
+                    ignoreMorespecifics: ignoreMorespecifics,
+                    ignore: excludeDelegated,
+                    group: group || "default"
+                };
+
             });
 
     const getAnnouncedPrefixes = (asn) => {
@@ -189,11 +196,10 @@ module.exports = function generatePrefixes(inputParameters) {
                                 .sort((a,b) => a-b)
                                 .pop();
 
-                            if (historical) {
-                                return latest.getTime() + (3600 * 24 * 1000 * 7) > new Date().getTime();
-                            } else {
-                                return latest.getTime() + (3600 * 24 * 1000) > new Date().getTime();
-                            }
+                            const validityPeriodDays = (historical) ?
+                                (3600 * 1000 * 24 * 7) : // 7 days
+                                (3600 * 1000 * 28); // 28 hours (1 day and 4 hours margin)
+                            return latest.getTime() + validityPeriodDays > new Date().getTime();
                         })
                 }
                 return [];
@@ -202,6 +208,7 @@ module.exports = function generatePrefixes(inputParameters) {
                 if (list.length === 0) {
                     logger(`WARNING: no announced prefixes were detected for AS${asn}. If you are sure the AS provided is announcing at least one prefix, this could be an issue with the data source (RIPEstat). Try to run the generate command with the option -H.`);
                 }
+
                 return list;
             })
             .then(list => list.filter(i => !exclude.includes(i.prefix)))
@@ -238,9 +245,8 @@ module.exports = function generatePrefixes(inputParameters) {
             });
     };
 
-    const getBaseRules = () => {
+    const getBaseRules = (prefixes) => {
         if (prefixes) {
-
             return batchPromises(40, prefixes, p => {
                 return generateRule(p, null, false, null, false);
             })
@@ -284,7 +290,7 @@ module.exports = function generatePrefixes(inputParameters) {
         return mergeDeep(current, yamlContent);
     };
 
-    return getBaseRules()
+    return getBaseRules(prefixes)
         .then(items => [].concat.apply([], items))
         .then(prefixes => {
             return batchPromises(1, prefixes, prefix => {
diff --git a/test b/test
new file mode 100644
index 0000000..f244456
--- /dev/null
+++ b/test
@@ -0,0 +1,59 @@
+193.0.10.0/23:
+  description: No description provided
+  asn:
+    - 3333
+  ignoreMorespecifics: false
+  ignore: false
+  group: default
+193.0.0.0/21:
+  description: No description provided
+  asn:
+    - 3333
+  ignoreMorespecifics: false
+  ignore: false
+  group: default
+'2001:67c:2e8::/48':
+  description: No description provided
+  asn:
+    - 3333
+  ignoreMorespecifics: false
+  ignore: false
+  group: default
+193.0.20.0/23:
+  description: No description provided
+  asn:
+    - 3333
+  ignoreMorespecifics: false
+  ignore: false
+  group: default
+193.0.22.0/23:
+  description: No description provided
+  asn:
+    - 3333
+  ignoreMorespecifics: false
+  ignore: false
+  group: default
+193.0.12.0/23:
+  description: No description provided
+  asn:
+    - 3333
+  ignoreMorespecifics: false
+  ignore: false
+  group: default
+193.0.18.0/23:
+  description: No description provided
+  asn:
+    - 3333
+  ignoreMorespecifics: false
+  ignore: false
+  group: default
+options:
+  generate:
+    asnList:
+      - '3333'
+    exclude: []
+    excludeDelegated: false
+    prefixes: null
+    monitoredASes: false
+    historical: true
+    group: null
diff --git a/tests/generate_tests/tests.js b/tests/generate_tests/tests.js
index e49d55b..2df0d77 100644
--- a/tests/generate_tests/tests.js
+++ b/tests/generate_tests/tests.js
@@ -57,7 +57,7 @@ describe("Prefix List", function() {
             monitoredASes: asns,
             httpProxy: null,
             debug: false,
-            historical: false,
+            historical: true,
             group: null,
             append: false,
             logger: () => {}
@@ -95,7 +95,7 @@ describe("Prefix List", function() {
             monitoredASes: asns,
             httpProxy: null,
             debug: false,
-            historical: false,
+            historical: true,
             group: "test",
             append: false,
             logger: () => {}
@@ -136,7 +136,7 @@ describe("Prefix List", function() {
             monitoredASes: asns,
             httpProxy: null,
             debug: false,
-            historical: false,
+            historical: true,
             group: "test",
             append: true,
             logger: () => {},