SC-25 Build fix