Fixed issues w/ stopping