Fix CI build pt. 2