Fix WP8