diff --git a/lib/library.cpp b/lib/library.cpp
index 917a989cb..30ae1760a 100644
--- a/lib/library.cpp
+++ b/lib/library.cpp
@@ -1361,7 +1361,8 @@ Library::UseRetValType Library::getUseRetValType(const Token *ftok) const
     if (Token::simpleMatch(ftok->astParent(), ".")) {
         using Yield = Library::Container::Yield;
         const Yield yield = astContainerYield(ftok->astParent()->astOperand1());
-        if (yield == Yield::START_ITERATOR || yield == Yield::END_ITERATOR || yield == Yield::SIZE || yield == Yield::EMPTY ||
+        if (yield == Yield::START_ITERATOR || yield == Yield::END_ITERATOR ||
+            yield == Yield::SIZE || yield == Yield::EMPTY || yield == Yield::BUFFER || yield == Yield::BUFFER_NT ||
             (yield == Yield::ITEM && astContainerAction(ftok->astParent()->astOperand1()) == Library::Container::Action::NO_ACTION))
             return Library::UseRetValType::DEFAULT;
     }