fix build break after merge