diff --git a/Cargo.toml b/Cargo.toml
index c6db9c5..6275120 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ lazy_static = "1.4.0"
 log = "0.4"
 env_logger = "0.8"
 mavlink = { version = "0.10.4", features = [ "ardupilotmega", "emit-extensions"] }
-paperclip = { git = "https://github.com/patrickelectric/paperclip", branch = "patrick-swagger", features = ["actix", "swagger-ui"] }
+paperclip = { version = "0.8", features = ["actix3", "v3", "paperclip-actix", "swagger-ui"] }
 regex = "1"
 serde = "1.0.115"
 serde_derive = "1.0.115"
diff --git a/src/server.rs b/src/server.rs
index 9bc89a4..2ec64a8 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -60,8 +60,9 @@ pub fn run(server_address: &str, mavlink_vehicle: &MAVLinkVehicleArcMutex) {
                 web::get().to(endpoints::root),
             )
             .route("/info", web::get().to(endpoints::info))
-            .service(default)
+            // Be sure to have default as the latest endpoint, otherwise it does not work
             .service(v1)
+            .service(default)
             .build()
     })
     .bind(server_address)