Fix build bug part 1