Fixed some issue

Match correct WIN with data