Build fix (take 2)