Further fix build error

Further fix build error