Fix car tracking issue