Fixed WP8 issue