Fix to TrackerStateHolder state check logic