Yet another build error fix