Window Build fix