Revert "Revert "Fix compile""

This reverts commit a146d3bbc816085321367ea42240b6e993375f94.