Fix WinRT + DRY