Fix to view stack view tracking