diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb
index 7915b10a3..8f46b1225 100644
--- a/app/helpers/budgets_helper.rb
+++ b/app/helpers/budgets_helper.rb
@@ -54,13 +54,13 @@ module BudgetsHelper
   end
 
   def investment_tags_select_options(budget)
-    tags = Budget::Investment.by_budget(budget).tags_on(:valuation).order(:name).pluck(:name)
+    tags = budget.investments.tags_on(:valuation).order(:name).pluck(:name)
     tags = tags.concat budget.budget_valuation_tags.split(",") if budget.budget_valuation_tags.present?
     tags.uniq
   end
 
   def investment_milestone_tags_select_options(budget)
-    tags = Budget::Investment.by_budget(budget).tags_on(:milestone).order(:name).pluck(:name)
+    tags = budget.investments.tags_on(:milestone).order(:name).pluck(:name)
     tags = tags.concat budget.budget_milestone_tags.split(",") if budget.budget_milestone_tags.present?
     tags.uniq
   end