fix current term issue

close issue #73 (current term is interim)

note: this fix changes the model and probably will break your current build