diff --git a/LibCarla/source/carla/image/CityScapesPalette.h b/LibCarla/source/carla/image/CityScapesPalette.h
index 721289c15..2cdebb836 100644
--- a/LibCarla/source/carla/image/CityScapesPalette.h
+++ b/LibCarla/source/carla/image/CityScapesPalette.h
@@ -45,8 +45,8 @@ namespace detail {
         // {  0u,   0u,  90u}, // caravan
         // {  0u,   0u, 110u}, // trailer
         // {  0u,   0u, 142u}, // license plate
-        {  0u,   0u, 230u}, // motorcycle    = 25u,
-        {  0u,  60u, 100u}, // bus           = 24u,
+        {  0u,   0u, 230u}, // motorcycle    = 24u,
+        //{  0u,  60u, 100u}, // bus           = 25u,
         // {  0u,  80u, 100u}, // train
         {119u,  11u,  32u}, // bicycle       = 26u,
         //{150u, 120u,  90u}, // tunnel       
diff --git a/LibCarla/source/carla/rpc/ObjectLabel.h b/LibCarla/source/carla/rpc/ObjectLabel.h
index aee408957..1bdc4ce5d 100644
--- a/LibCarla/source/carla/rpc/ObjectLabel.h
+++ b/LibCarla/source/carla/rpc/ObjectLabel.h
@@ -38,9 +38,8 @@ namespace rpc {
     Water        =  21u,
     Terrain      =  22u,
     Truck        =  23u,
-    Bus          =  24u,
-    Motorcycle   =  25u,
-    Bicycle      =  26u,
+    Motorcycle   =  24u,
+    Bicycle      =  25u,
     Any          =  0xFF
   };
 
diff --git a/PythonAPI/carla/source/libcarla/World.cpp b/PythonAPI/carla/source/libcarla/World.cpp
index 4a6d83436..ad969e8e2 100644
--- a/PythonAPI/carla/source/libcarla/World.cpp
+++ b/PythonAPI/carla/source/libcarla/World.cpp
@@ -226,7 +226,6 @@ void export_world() {
     .value("Water", cr::CityObjectLabel::Water)
     .value("Terrain", cr::CityObjectLabel::Terrain)
     .value("Truck", cr::CityObjectLabel::Truck)
-    .value("Bus", cr::CityObjectLabel::Bus)
     .value("Motorcycle", cr::CityObjectLabel::Motorcycle)
     .value("Bicycle", cr::CityObjectLabel::Bicycle)
 
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp
index a3036a2ae..dbb6f14ac 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp
@@ -47,9 +47,8 @@ crp::CityObjectLabel ATagger::GetLabelByFolderName(const FString &String) {
   else if (String == "Water")        return crp::CityObjectLabel::Water;
   else if (String == "Terrain")      return crp::CityObjectLabel::Terrain;
   else if (String == "Truck")      return crp::CityObjectLabel::Truck;
-  else if (String == "Bus")      return crp::CityObjectLabel::Bus;
   else if (String == "Motorcycle")      return crp::CityObjectLabel::Motorcycle;
-  else if (String == "Bicycle")      return crp::CityObjectLabel::Motorcycle;
+  else if (String == "Bicycle")      return crp::CityObjectLabel::Bicycle;
 
   else                               return crp::CityObjectLabel::None;
 }
@@ -257,7 +256,6 @@ FString ATagger::GetTagAsString(const crp::CityObjectLabel Label)
     CARLA_GET_LABEL_STR(Water)
     CARLA_GET_LABEL_STR(Terrain)
     CARLA_GET_LABEL_STR(Truck)
-    CARLA_GET_LABEL_STR(Bus)
     CARLA_GET_LABEL_STR(Motorcycle)
     CARLA_GET_LABEL_STR(Bicycle)