(Griffin) Build fix