better handling of winrt