fixing deeper tracking