updated with fix for wp8