fix eway bugs