SC-28 Build fix