SC-40 Build fix