fix build error
merged