Windows Phone FIX - Untested