Fixing for windows phone