Termination Bug Fix