Possible bug fix for stopping problem