SC-12 Build fix