diff --git a/lib/token.cpp b/lib/token.cpp
index fe1f6c8c4..d09de8278 100644
--- a/lib/token.cpp
+++ b/lib/token.cpp
@@ -1209,7 +1209,7 @@ static std::string stringFromTokenRange(const Token* start, const Token* end)
             ret << "unsigned ";
         if (tok->isLong())
             ret << (tok->isLiteral() ? "L" : "long ");
-        if (tok->originalName().empty()) {
+        if (tok->originalName().empty() || tok->isUnsigned() || tok->isLong()) {
             ret << tok->str();
         } else
             ret << tok->originalName();