Fix bugs
epic win fix