moved condition to ignore terminal