Fix force-stop issue on Linux and Mac(?)