diff --git a/src/lib/pubkey/classic_mceliece/cmce_decaps.cpp b/src/lib/pubkey/classic_mceliece/cmce_decaps.cpp
index 6a0b5574907..1de0ec3f3c5 100644
--- a/src/lib/pubkey/classic_mceliece/cmce_decaps.cpp
+++ b/src/lib/pubkey/classic_mceliece/cmce_decaps.cpp
@@ -162,4 +162,4 @@ void Classic_McEliece_Decryptor::kem_decrypt(std::span<uint8_t> out_shared_key,
    hash_func->final(out_shared_key);
 }
 
-}  // namespace Botan
\ No newline at end of file
+}  // namespace Botan
diff --git a/src/lib/pubkey/classic_mceliece/cmce_decaps.h b/src/lib/pubkey/classic_mceliece/cmce_decaps.h
index f3aa7406215..fa12b87fe13 100644
--- a/src/lib/pubkey/classic_mceliece/cmce_decaps.h
+++ b/src/lib/pubkey/classic_mceliece/cmce_decaps.h
@@ -85,4 +85,4 @@ class BOTAN_TEST_API Classic_McEliece_Decryptor final : public PK_Ops::KEM_Decry
 
 }  // namespace Botan
 
-#endif  // BOTAN_CMCE_DECAPS_H_
\ No newline at end of file
+#endif  // BOTAN_CMCE_DECAPS_H_
diff --git a/src/lib/pubkey/classic_mceliece/cmce_encaps.cpp b/src/lib/pubkey/classic_mceliece/cmce_encaps.cpp
index e11809329a3..575a5104678 100644
--- a/src/lib/pubkey/classic_mceliece/cmce_encaps.cpp
+++ b/src/lib/pubkey/classic_mceliece/cmce_encaps.cpp
@@ -113,4 +113,4 @@ void Classic_McEliece_Encryptor::kem_encrypt(std::span<uint8_t> out_encapsulated
    std::ranges::copy(big_k, out_shared_key.begin());
 }
 
-}  // namespace Botan
\ No newline at end of file
+}  // namespace Botan
diff --git a/src/lib/pubkey/classic_mceliece/cmce_encaps.h b/src/lib/pubkey/classic_mceliece/cmce_encaps.h
index a05ce66fedf..21e2e781860 100644
--- a/src/lib/pubkey/classic_mceliece/cmce_encaps.h
+++ b/src/lib/pubkey/classic_mceliece/cmce_encaps.h
@@ -62,4 +62,4 @@ class BOTAN_TEST_API Classic_McEliece_Encryptor final : public PK_Ops::KEM_Encry
 
 }  // namespace Botan
 
-#endif  // BOTAN_CMCE_ENCAPS_H_
\ No newline at end of file
+#endif  // BOTAN_CMCE_ENCAPS_H_
diff --git a/src/lib/pubkey/classic_mceliece/cmce_poly.cpp b/src/lib/pubkey/classic_mceliece/cmce_poly.cpp
index 1a168a8b518..60ab2d780bc 100644
--- a/src/lib/pubkey/classic_mceliece/cmce_poly.cpp
+++ b/src/lib/pubkey/classic_mceliece/cmce_poly.cpp
@@ -125,7 +125,8 @@ std::optional<Classic_McEliece_Minimal_Polynomial> Classic_McEliece_Polynomial_R
 
 secure_vector<uint8_t> Classic_McEliece_Minimal_Polynomial::serialize() const {
    BOTAN_ASSERT_NOMSG(!coef().empty());
-   auto coeffs_to_store = std::ranges::subrange(coef().begin(), coef().end() - 1);
+   auto& all_coeffs = coef();
+   auto coeffs_to_store = std::span(all_coeffs).subspan(0, all_coeffs.size() - 1);
    secure_vector<uint8_t> bytes(sizeof(u_int16_t) * coeffs_to_store.size());
    BufferStuffer bytes_stuf(bytes);
    for(auto& coef : coeffs_to_store) {