Bugfix: the reset-save-next-guard-id?! didn't actually get executed