Fixing bug that occurred during merge conflict, ready to test online now

[#63420846]