stop function fix
Revert "stop function fix"

This reverts commit 0d0a812effe74168457434c9e6bff9b77d8d483a.
stop function fix