FIxed to work on Windpws Phone 8.1