Another bug fix with WP8 navigation