diff --git a/uppsrc/ide/Browser/Browser.h b/uppsrc/ide/Browser/Browser.h
index 4c85b94a6..89402aa9f 100644
--- a/uppsrc/ide/Browser/Browser.h
+++ b/uppsrc/ide/Browser/Browser.h
@@ -158,8 +158,8 @@ struct CodeBrowser {
 	void               NameStart()               { display.namestart = true; }
 	String             GetCodeRef(int i) const;
 	String             GetCodeRef() const;
-	const CppItemInfo& GetItemInfo(int i) const;
-	const CppItemInfo& GetItemInfo() const;
+	CppItemInfo        GetItemInfo(int i) const;
+	CppItemInfo        GetItemInfo() const;
 	bool               Key(dword key, int count);
 	bool               IsSearch() const;
 	void               ClearSearch();
diff --git a/uppsrc/ide/Browser/CodeBrowser.cpp b/uppsrc/ide/Browser/CodeBrowser.cpp
index a548eae2d..bd399608a 100644
--- a/uppsrc/ide/Browser/CodeBrowser.cpp
+++ b/uppsrc/ide/Browser/CodeBrowser.cpp
@@ -232,12 +232,12 @@ String CodeBrowser::GetCodeRef() const
 	return item.IsCursor() ? GetCodeRef(item.GetCursor()) : String();
 }
 
-const CppItemInfo& CodeBrowser::GetItemInfo(int i) const
+CppItemInfo CodeBrowser::GetItemInfo(int i) const
 {
 	return ValueTo<CppItemInfo>(item.Get(i, 1));
 }
 
-const CppItemInfo& CodeBrowser::GetItemInfo() const
+CppItemInfo CodeBrowser::GetItemInfo() const
 {
 	return GetItemInfo(item.GetCursor());
 }
diff --git a/uppsrc/ide/Browser/CodeRef.cpp b/uppsrc/ide/Browser/CodeRef.cpp
index 8075ab0c8..e6e5930fd 100644
--- a/uppsrc/ide/Browser/CodeRef.cpp
+++ b/uppsrc/ide/Browser/CodeRef.cpp
@@ -325,13 +325,13 @@ void TopicEditor::InsertItem()
 	if(ref.item.IsSelection()) {
 		for(int i = 0; i < ref.item.GetCount(); i++)
 			if(ref.item.IsSelected(i)) {
-				const CppItemInfo& m = ref.GetItemInfo(i);
+				CppItemInfo m = ref.GetItemInfo(i);
 				qtf << CreateQtf(ref.GetCodeRef(i), m.name, m, GetLang());
 			}
 	}
 	else
 	if(ref.item.IsCursor()) {
-		const CppItemInfo& m = ref.GetItemInfo();
+		CppItemInfo m = ref.GetItemInfo();
 		qtf << CreateQtf(ref.GetCodeRef(), m.name, m, GetLang());
 	}
 	else