contiunue the fix for check-at-startup, eade694613c19ffe747ccb77466070e474e3f968