Fixed start and stop tracking issues