Added windows phone fix