Fix for #121 in WP7