fixed stop issue