Unexpected tracking toggle bugfix