diff --git a/src/game.h b/src/game.h
index 36d155e..9e863c6 100644
--- a/src/game.h
+++ b/src/game.h
@@ -12,17 +12,18 @@
 
 class game final {
 private:
+        feature features;
         std::unique_ptr<input>   &in;
         std::unique_ptr<display> &out;
         std::unique_ptr<logger>  &log;
-        feature features;
-        std::unique_ptr<RNG> rng;
+        std::unique_ptr<RNG>     &rng;
         std::unique_ptr<character> player;
 public:
         game(const feature enabled_features,
              std::unique_ptr<input>   &new_in,
              std::unique_ptr<display> &new_out,
-             std::unique_ptr<logger>  &new_log);
+             std::unique_ptr<logger>  &new_log,
+             std::unique_ptr<RNG>     &new_rng);
         game_status run();
 private:
         int getcmd() const;
diff --git a/src/main.cc b/src/main.cc
index 10ff2b1..44332fa 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -9,17 +9,17 @@ int main(int argc, char **argv) {
         std::unique_ptr<RNG>     rng;
 
 
-        feature enabled_features = proc_args(argc, argv, 
+        feature enabled_features = proc_args(argc, argv,
                                              curse, in, out, log, rng);
 
         if (enabled_features &
-            (FEATURE_PANIC | FEATURE_PANIC_FILE | 
+            (FEATURE_PANIC | FEATURE_PANIC_FILE |
              FEATURE_CONFLICT | FEATURE_PANIC_SEED)) {
                 panic_args(enabled_features);
                 return RETURN_PANICKED;
         }
 
-        game game_proc(enabled_features, in, out, log);
+        game game_proc(enabled_features, in, out, log, rng);
 
         while (game_proc.run() != game_status::terminated)
                 out->render();