SafeRunner.run can be called twice (forgot to set  flag in the new version), now fix it