alex, andrei fix build