Added a fix for WP8