bugfix
bufix stop with state
bugfix