diff --git a/run b/run
index f04930a..444eaee 100755
--- a/run
+++ b/run
@@ -190,9 +190,11 @@ def main(args, extra_args=None):
                         '--command-line', 'earlyprintk=pl011,0x1c090000 lpj=19988480 rw loglevel=8 mem={} root=/dev/sda {}'.format(memory, kernel_cli), common.Newline,
                         '--dtb-filename', os.path.join(common.gem5_system_dir, 'arm', 'dt', 'armv{}_gem5_v1_{}cpu.dtb'.format(common.armv, args.cpus)), common.Newline,
                         '--machine-type', common.machine, common.Newline,
-                        '--param', 'system.panic_on_panic = True', common.Newline,
                     ])
-                    if not args.baremetal is None:
+                    if args.baremetal is None:
+                        cmd.extend([
+                            '--param', 'system.panic_on_panic = True', common.Newline])
+                    else:
                         cmd.extend(['--bare-metal', common.Newline])
                         if args.arch == 'aarch64':
                             # https://stackoverflow.com/questions/43682311/uart-communication-in-gem5-with-arm-bare-metal/50983650#50983650