Applied Sergey's changes to WP7 as well