I believe I have fixed this issue in the new eway contrib.
Works for me but the latest version (2.1) is still being approved, wait for it, don't get v2.