Fixing backward incompatibility, adding -terminate