Fixed Windows Phone 8 issue