Bug fix and re-enabled Tracking mode (not working)