Trying to fix wp8