Bug/detraitify windows@897004