diff --git a/scwx-qt/source/scwx/qt/ui/setup/setup_wizard.cpp b/scwx-qt/source/scwx/qt/ui/setup/setup_wizard.cpp
index 92be250f..9b265bd4 100644
--- a/scwx-qt/source/scwx/qt/ui/setup/setup_wizard.cpp
+++ b/scwx-qt/source/scwx/qt/ui/setup/setup_wizard.cpp
@@ -22,6 +22,9 @@ class SetupWizard::Impl
 public:
    explicit Impl() = default;
    ~Impl()         = default;
+
+   bool mapProviderPageIsRequired_ {MapProviderPage::IsRequired()};
+   bool audioCodecPageIsRequired_ {AudioCodecPage::IsRequired()};
 };
 
 SetupWizard::SetupWizard(QWidget* parent) :
@@ -66,14 +69,14 @@ int SetupWizard::nextId() const
       {
       case static_cast<int>(Page::MapProvider):
       case static_cast<int>(Page::MapLayout):
-         if (MapProviderPage::IsRequired())
+         if (p->mapProviderPageIsRequired_)
          {
             return nextId;
          }
          break;
 
       case static_cast<int>(Page::AudioCodec):
-         if (AudioCodecPage::IsRequired())
+         if (p->audioCodecPageIsRequired_)
          {
             return nextId;
          }