diff --git a/.github/workflows/R-CMD-check-rstan.yaml b/.github/workflows/R-CMD-check-rstan.yaml
index c60a6690..76d2b062 100644
--- a/.github/workflows/R-CMD-check-rstan.yaml
+++ b/.github/workflows/R-CMD-check-rstan.yaml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,   r: 'release'}
+          - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
           - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest, r: 'release'}
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index 14fe20fa..e160b031 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches: [main, master]
 
-name: R-CMD-check-cmdstan
+name: R-CMD-check
 
 jobs:
   R-CMD-check:
diff --git a/R/mvgam.R b/R/mvgam.R
index 2a3869b7..16958fe0 100644
--- a/R/mvgam.R
+++ b/R/mvgam.R
@@ -1355,6 +1355,16 @@ mvgam = function(formula,
                                         'laplace'))
     backend <- match.arg(backend, c('rstan',
                                     'cmdstanr'))
+
+    cmdstan_avail <- insight::check_if_installed('cmdstanr',
+                                                 stop = FALSE,
+                                                 quietly = TRUE)
+
+    if(isTRUE(cmdstan_avail)){
+      if(is.null(cmdstanr::cmdstan_version(error_on_NA = FALSE))){
+        backend <- 'rstan'
+      }
+    }
     fit_engine <- 'stan'
     use_cmdstan <- ifelse(backend == 'cmdstanr', TRUE, FALSE)
 
diff --git a/src/mvgam.dll b/src/mvgam.dll
index 91257747..df9ceec8 100644
Binary files a/src/mvgam.dll and b/src/mvgam.dll differ
diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf
index 5e473c09..89adc2b3 100644
Binary files a/tests/testthat/Rplots.pdf and b/tests/testthat/Rplots.pdf differ