Fix build break

**Description** Two PRs were merged which worked OK by themselves, but the resulting merged code did not compile.
**Testing** Tests pass