Fixed issue with wp8