V2 of build error fix for FCC