fixed windows + windows phone support