fixed WP7 solution