fix eway bugs
fix eway bugs