diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 7d26609..9d740aa 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -404,7 +404,7 @@ private:
             else
                 write(" ");
         }
-        else if (index < tokens.length && (currentIs(tok!"@") || !isOperator(tokens[index].type)))
+        else if (index < tokens.length && (currentIs(tok!"@") || isBasicType(tokens[index].type)))
             write(" ");
     }
 
@@ -720,6 +720,8 @@ private:
                 write(" ");
             break;
         default:
+            if (peekBackIs(tok!"identifier"))
+                write(" ");
             if (index + 1 < tokens.length)
             {
                 if (!peekIs(tok!"@") && (peekIsOperator() || peekIs(tok!"out") || peekIs(tok!"in")))
diff --git a/tests/allman/issue0146.d.ref b/tests/allman/issue0146.d.ref
new file mode 100644
index 0000000..9854d89
--- /dev/null
+++ b/tests/allman/issue0146.d.ref
@@ -0,0 +1 @@
+alias FooFactory = Foo delegate();
diff --git a/tests/issue0146.d b/tests/issue0146.d
new file mode 100644
index 0000000..9854d89
--- /dev/null
+++ b/tests/issue0146.d
@@ -0,0 +1 @@
+alias FooFactory = Foo delegate();
diff --git a/tests/otbs/issue0146.d.ref b/tests/otbs/issue0146.d.ref
new file mode 100644
index 0000000..9854d89
--- /dev/null
+++ b/tests/otbs/issue0146.d.ref
@@ -0,0 +1 @@
+alias FooFactory = Foo delegate();