Another attempt at fixing build error