(#4795, #4796)  Fix build problem. :(