diff --git a/AMDiS/src/Initfile.cc b/AMDiS/src/Initfile.cc
index 9f7127824a4f343e52fa9cb4cccc9d7919db01b1..3ae5752b3f39cf4391a2c977985394c74cd8fe97 100644
--- a/AMDiS/src/Initfile.cc
+++ b/AMDiS/src/Initfile.cc
@@ -88,7 +88,7 @@ namespace AMDiS {
     //const unsigned line_length = 512;
     std::string swap;
     std::getline(in, swap);
-    while (in.good() || in.gcount() > 0) {
+    while (in.good() || swap.size() > 0) {
       std::string whitespaces = " \t\r\f\n";
       std::string delimiter = "\r\n";
       std::string sw(swap);
@@ -147,6 +147,7 @@ namespace AMDiS {
         read(fn, forceRead);
       }
 
+      swap.clear();
       getline(in, swap);
     }
   }