#1066 Build fix