Wp8 fix