ToRevert: Workaround for calling RunOnce 2x