bugfix stop