Fixed terminator issues.