#4797: Try fix build