Fixed stopping issue