Fixed build after #8508364 and #7ab3860