Fixed to work windows phone 8.1