Fixed the main tracking stack