Fix for issues, cuased by Microsoft update 1709