try to redefine stop logic