Issue #123: fixed some issues related with stop button behaviour