Fix compile error following the backport