diff --git a/src/frontend/inp.c b/src/frontend/inp.c
index ee0ae6cbf..b84623b6d 100644
--- a/src/frontend/inp.c
+++ b/src/frontend/inp.c
@@ -727,12 +727,15 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
 #ifdef HAS_PROGREP
             SetAnalyse("Prepare Deck", 0);
 #endif
-            /*FIXME This is for the globel param setting only */
-            /* replace agauss(x,y,z) in each b-line by suitable value */
-            static char *statfcn[] = { "agauss", "gauss", "aunif", "unif", "limit" };
-            int ii;
-            for (ii = 0; ii < 5; ii++)
-                eval_agauss(deck, statfcn[ii]);
+            /*This is for the globel param setting only */
+            /* replace agauss(x,y,z) in each b-line by suitable value, one for all */
+            bool statlocal = cp_getvar("statlocal", CP_BOOL, NULL, 0);
+            if (!statlocal) {
+                static char *statfcn[] = {"agauss", "gauss", "aunif", "unif", "limit"};
+                int ii;
+                for (ii = 0; ii < 5; ii++)
+                    eval_agauss(deck, statfcn[ii]);
+            }
             /* Now expand subcircuit macros and substitute numparams.*/
             if (!cp_getvar("nosubckt", CP_BOOL, NULL, 0))
                 if ((deck->nextcard = inp_subcktexpand(deck->nextcard)) == NULL) {
@@ -815,11 +818,13 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
 
             /* replace agauss(x,y,z) in each b-line by suitable value */
             /* FIXME: This is for the local param setting (not yet implemented in
-            inp_fix_agauss_in_param() for model parameters according to HSPICE manual)
-            static char *statfcn[] = { "agauss", "gauss", "aunif", "unif", "limit" };
-            int ii;
-            for (ii = 0; ii < 5; ii++)
-                eval_agauss(deck, statfcn[ii]); */
+            inp_fix_agauss_in_param() for model parameters according to HSPICE manual)*/
+            if (statlocal) {
+                static char *statfcn[] = {"agauss", "gauss", "aunif", "unif", "limit"};
+                int ii;
+                for (ii = 0; ii < 5; ii++)
+                    eval_agauss(deck, statfcn[ii]);
+            }
             /* If user wants all currents saved (.options savecurrents), add .save 
             to wl_first with all terminal currents available on selected devices */
             wl_first = inp_savecurrents(deck, options, wl_first, controls);