fix behavior of stop