Address comment warning to avoid future breaks

I noticed your warning comment in the method while refactoring. I _think_ this should solve it.