Fixed WP8 bug