current term logic fix