Revert "Revert "Fix build...""

This reverts commit ccb5d4ce207c93f251b654170019f44cb1827c72.
fix build