Fixed bug with tracking