revert to better code for termination - again