Fix for WP 8.0 GDR3