Bugfix for SystemExit change