Windows Phone 8 fix