diff --git a/src/dfmt.d b/src/dfmt.d
index a794075..be2b98e 100644
--- a/src/dfmt.d
+++ b/src/dfmt.d
@@ -201,6 +201,8 @@ private:
                 else
                     newline();
             }
+            else
+                newline();
         }
         else if (isStringLiteral(current.type) || isNumberLiteral(current.type)
             || current.type == tok!"characterLiteral")
@@ -228,7 +230,7 @@ private:
                         newline();
                         break;
                     }
-                    if (current.type == tok!"comment")
+                    if (current.type == tok!"comment" && current.line == peekBack().line)
                         break;
                     if (!(t == tok!"import" && current.type == tok!"import"))
                         write("\n");
@@ -799,6 +801,12 @@ private:
         return tokens[index];
     }
 
+    const(Token) peekBack()
+    {
+        assert (index > 0);
+        return tokens[index - 1];
+    }
+
     bool peekBackIs(IdType tokenType)
     {
         return (index >= 1) && tokens[index - 1].type == tokenType;
diff --git a/tests/issue0018.d b/tests/issue0018.d
new file mode 100644
index 0000000..2e7d77c
--- /dev/null
+++ b/tests/issue0018.d
@@ -0,0 +1,5 @@
+import core.stdc.ctype;
+
+/*********************************************
+ *
+ */
diff --git a/tests/issue0018.d.ref b/tests/issue0018.d.ref
new file mode 100644
index 0000000..2e7d77c
--- /dev/null
+++ b/tests/issue0018.d.ref
@@ -0,0 +1,5 @@
+import core.stdc.ctype;
+
+/*********************************************
+ *
+ */