Bugfix for stopping problem?