removed warning
moved stop-code into internal method so around(cmd_stop) only fires when it should