CW-154 - Fix stop button functionality