HHH-8215 - Fix for windows build