diff --git a/aiserver.py b/aiserver.py
index cca2b10e..e38f25b3 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -875,6 +875,9 @@ if(not vars.model in ["InferKit", "Colab", "OAI", "ReadOnly", "TPUMeshTransforme
             kwargs["logits_warper"] = new_get_logits_warper(
                 beams=1,
             )
+            if(vars.newlinemode == "s"):
+                kwargs["eos_token_id"] = -1
+                kwargs.setdefault("pad_token_id", 2)
             return new_sample.old_sample(self, *args, **kwargs)
         new_sample.old_sample = transformers.generation_utils.GenerationMixin.sample
         transformers.generation_utils.GenerationMixin.sample = new_sample
@@ -2928,7 +2931,6 @@ def _generate(txt, minimum, maximum, found_entries):
             genout = generator(
                 gen_in, 
                 do_sample=True, 
-                min_length=minimum, 
                 max_length=int(2e9),
                 repetition_penalty=1.1,
                 bad_words_ids=vars.badwordsids,