partial fix to account termination issues