Fix WP8. Again.