Fix windows+D crashes - Vix-527