diff --git a/.Rbuildignore b/.Rbuildignore
index 2a2a753d061baa9dab657853b564427c97df1ec6..da906688382daf52144113e08e6a8476f4bbf46f 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -12,3 +12,5 @@
 ^cran-comments\.md$
 ./vignettes/*.md
 ^inst/doc/paper-figure-PlotForecastPDF\.R$
+^.*\.Rproj$
+^\.Rproj\.user$
diff --git a/.gitignore b/.gitignore
index 23a560302d2818630fb7428585681dd3b07a2b3a..022a30629db6bd51b4ac7c3e219e369e28e7cdaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ Rplots.pdf
 *.RData
 !data/*.RData
 .\.nfs*
+.Rproj.user
diff --git a/R/PeriodStandardization.R b/R/PeriodStandardization.R
index 00ebc71e9d89a57abad615e4d512c286582da3b1..dcef84706fc557b3c8802cb800a9e7144698939f 100644
--- a/R/PeriodStandardization.R
+++ b/R/PeriodStandardization.R
@@ -617,8 +617,8 @@ PeriodStandardization <- function(data, data_cor = NULL, dates = NULL,
   }
   if (handle_infinity) { 
     # could also use "param_error" ?; we are giving it the min/max value of the grid point
-    spei_mod[is.infinite(spei_mod) & spei_mod < 0] <- min(spei_mod[!is.infinite(spei_mod)])
-    spei_mod[is.infinite(spei_mod) & spei_mod > 0] <- max(spei_mod[!is.infinite(spei_mod)]) 
+    spei_mod[is.infinite(spei_mod) & spei_mod < 0] <- min(spei_mod[!is.infinite(spei_mod)],na.rm = TRUE)
+    spei_mod[is.infinite(spei_mod) & spei_mod > 0] <- max(spei_mod[!is.infinite(spei_mod)],na.rm = TRUE) 
   }
   if (return_params) {
     return(list(spei = spei_mod, params = params_result))