* Fix tracking from first start

