core fix build