[TIMOB-15753] Fixed a missed refactor that was causing a subtle crash