Added logic to avoid suspending on stop.