(#2185) - WIP - try windows 7