Fix compile error due to 2.4 to master difference