Don't kill EVAs ever-should help/fix #300 but testing required