Fix build bug part 2